diff --git a/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch index 6de432316d..14dad4fbf6 100644 --- a/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch +++ b/Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch @@ -22,7 +22,7 @@ index 71d0db3f3..a51b648c5 100644 this.a(entity, entity.ac); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c0816b9f8..36818bf55 100644 +index c0816b9f8..bd15f0588 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { @@ -87,12 +87,9 @@ index c0816b9f8..36818bf55 100644 } // CraftBukkit end */ -- if (this.isLoaded(tileentity1.getPosition())) { -- Chunk chunk = this.getChunkAtWorldCoords(tileentity1.getPosition()); + // Paper -+ net.minecraft.server.Chunk chunk = tileentity1.getCurrentChunk(); -+ if (chunk != null) { -+ //Chunk chunk = this.getChunkAtWorldCoords(tileentity1.getPosition()); + if (this.isLoaded(tileentity1.getPosition())) { + Chunk chunk = this.getChunkAtWorldCoords(tileentity1.getPosition()); + // Paper end IBlockData iblockdata = chunk.getBlockData(tileentity1.getPosition());