Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "SPIGOT-4825: Clearly error on asynchronous tile access"

Browse Source 
This reverts commit 5a37f430592a2de6abb3a6ec9674200f9c7bc32d.
This commit is contained in:
md_5 2019-05-01 08:51:01 +10:00
parent 5a37f43059
commit 4f420d8274
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nms-patches/World.patch
View File

@ -312,7 +312,7 @@
} }
} }
} }
@@ -626,14 +838,21 @@ @@ -626,6 +838,7 @@
} }
} }
@ -320,11 +320,9 @@
@Nullable @Nullable
@Override @Override
public TileEntity getTileEntity(BlockPosition blockposition) { public TileEntity getTileEntity(BlockPosition blockposition) {
if (isInsideWorld(blockposition)) { @@ -634,6 +847,12 @@
return null;
} else if (!this.isClientSide && Thread.currentThread() != this.c) { } else if (!this.isClientSide && Thread.currentThread() != this.c) {
- return null; return null;
+ throw new IllegalStateException("Asynchronous tile access"); // CraftBukkit - catch
} else { } else {
+ // CraftBukkit start + // CraftBukkit start
+ if (capturedTileEntities.containsKey(blockposition)) { + if (capturedTileEntities.containsKey(blockposition)) {