3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 12:30:06 +01:00

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

This reverts commit 5a37f43059.
Dieser Commit ist enthalten in:
md_5 2019-05-01 08:51:01 +10:00
Ursprung 5a37f43059
Commit 4f420d8274

Datei anzeigen

@ -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)) {