OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-04 22:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-4825: Clearly error on asynchronous tile access

Browse source
This commit is contained in:
md_5 2019-05-01 06:59:38 +10:00
parent bbd66d2046
commit 5a37f43059
1 changed files with 5 additions and 3 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,6 +838,7 @@ @@ -626,14 +838,21 @@
} }
} }
@ -320,9 +320,11 @@
@Nullable @Nullable
@Override @Override
public TileEntity getTileEntity(BlockPosition blockposition) { public TileEntity getTileEntity(BlockPosition blockposition) {
@@ -634,6 +847,12 @@ if (isInsideWorld(blockposition)) {
} else if (!this.isClientSide && Thread.currentThread() != this.c) {
return null; return null;
} else if (!this.isClientSide && Thread.currentThread() != this.c) {
- return null;
+ throw new IllegalStateException("Asynchronous tile access"); // CraftBukkit - catch
} else { } else {
+ // CraftBukkit start + // CraftBukkit start
+ if (capturedTileEntities.containsKey(blockposition)) { + if (capturedTileEntities.containsKey(blockposition)) {