From 64264f61b886f50d6b32c2d1df389c09f6253029 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Tue, 14 Feb 2012 02:37:47 -0500 Subject: [PATCH] Revert "Remove tile entities when a block is removed." This reverts commit 1d4347fbaf3c891580a9ee40a8e9632c992f8b08. --- src/main/java/net/minecraft/server/Chunk.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index ddcea3e8fe..e7a86c939e 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -311,11 +311,8 @@ public class Chunk { if (l1 != 0) { if (!this.world.isStatic) { Block.byId[l1].remove(this.world, i2, j, j2); - // CraftBukkit start - delete tile entities for removed blocks - if (Block.byId[l1] instanceof BlockContainer) { - this.world.n(i2, j, j2); - } - // CraftBukkit end + } else if (Block.byId[l1] instanceof BlockContainer && l1 != l) { + this.world.n(i2, j, j2); } } @@ -387,11 +384,6 @@ public class Chunk { this.b[i << this.world.heightBitsPlusFour | k << this.world.heightBits | j] = (byte) (b0 & 255); if (k1 != 0) { Block.byId[k1].remove(this.world, l1, j, i2); - // CraftBukkit start - delete tile entities for removed blocks - if (Block.byId[k1] instanceof BlockContainer) { - this.world.n(l1, j, i2); - } - // CraftBukkit end } if ((this.b[i << this.world.heightBitsPlusFour | k << this.world.heightBits | j] & 255) != l) return false; // CraftBukkit