diff options
author | EvilSeph <evilseph@gmail.com> | 2012-02-14 02:37:47 -0500 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-02-14 02:37:47 -0500 |
commit | 64264f61b886f50d6b32c2d1df389c09f6253029 (patch) | |
tree | 80229f2777877ba32aa8754d0b16e1028b494c34 /src | |
parent | 8773c3ed404b64b79c037201ac2b4fc425419986 (diff) | |
download | craftbukkit-64264f61b886f50d6b32c2d1df389c09f6253029.tar craftbukkit-64264f61b886f50d6b32c2d1df389c09f6253029.tar.gz craftbukkit-64264f61b886f50d6b32c2d1df389c09f6253029.tar.lz craftbukkit-64264f61b886f50d6b32c2d1df389c09f6253029.tar.xz craftbukkit-64264f61b886f50d6b32c2d1df389c09f6253029.zip |
Revert "Remove tile entities when a block is removed."
This reverts commit 1d4347fbaf3c891580a9ee40a8e9632c992f8b08.
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/net/minecraft/server/Chunk.java | 12 |
1 files 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 ddcea3e8..e7a86c93 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 |