Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-25 18:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Remove tile entities when a block is removed."

Browse Source 
This reverts commit 1d4347fbaf3c891580a9ee40a8e9632c992f8b08.
This commit is contained in:
EvilSeph 2012-02-14 02:37:47 -05:00
parent 8773c3ed40
commit 64264f61b8
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minecraft/server/Chunk.java
View File

@ -311,11 +311,8 @@ public class Chunk {
if (l1 != 0) { if (l1 != 0) {
if (!this.world.isStatic) { if (!this.world.isStatic) {
Block.byId[l1].remove(this.world, i2, j, j2); Block.byId[l1].remove(this.world, i2, j, j2);
// CraftBukkit start - delete tile entities for removed blocks } else if (Block.byId[l1] instanceof BlockContainer && l1 != l) {
if (Block.byId[l1] instanceof BlockContainer) { this.world.n(i2, j, j2);
this.world.n(i2, j, j2);
}
// CraftBukkit end
} }
} }
@ -387,11 +384,6 @@ public class Chunk {
this.b[i << this.world.heightBitsPlusFour | k << this.world.heightBits | j] = (byte) (b0 & 255); this.b[i << this.world.heightBitsPlusFour | k << this.world.heightBits | j] = (byte) (b0 & 255);
if (k1 != 0) { if (k1 != 0) {
Block.byId[k1].remove(this.world, l1, j, i2); 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 if ((this.b[i << this.world.heightBitsPlusFour | k << this.world.heightBits | j] & 255) != l) return false; // CraftBukkit