From cef8c2f3572889b5b3af35824755537255152c1e Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Wed, 1 May 2019 08:51:01 +1000 Subject: [PATCH] Revert "SPIGOT-4825: Clearly error on asynchronous tile access" This reverts commit ff6da1142675122db93f38c92cddeddf5b8a1f17. By: md_5 --- paper-server/nms-patches/World.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/paper-server/nms-patches/World.patch b/paper-server/nms-patches/World.patch index 4bd60fff4..fe43a7511 100644 --- a/paper-server/nms-patches/World.patch +++ b/paper-server/nms-patches/World.patch @@ -312,7 +312,7 @@ } } } -@@ -626,14 +838,21 @@ +@@ -626,6 +838,7 @@ } } @@ -320,11 +320,9 @@ @Nullable @Override public TileEntity getTileEntity(BlockPosition blockposition) { - if (isInsideWorld(blockposition)) { - return null; +@@ -634,6 +847,12 @@ } else if (!this.isClientSide && Thread.currentThread() != this.c) { -- return null; -+ throw new IllegalStateException("Asynchronous tile access"); // CraftBukkit - catch + return null; } else { + // CraftBukkit start + if (capturedTileEntities.containsKey(blockposition)) {