Process block cleanup first. Fixes BUKKIT-4103

When setting a block the server sets the new block ID, calls the cleanup
on the old block, then calls the placement logic for the new block. This
would normally work correctly but we have logic to prevent errors that is
causing one here. When trying to clean up the old block we notice the block
ID has changed and try to fix things, this causes the cleanup logic to
fail. To ensure cleanup happens correctly we now do all the cleanup before
changing the block which avoids triggering the fixup code.
This commit is contained in:
Travis Watkins 2013-12-20 16:40:28 -06:00 committed by EvilSeph
parent 4a5de4249c
commit c57e45dcdc

View File

@ -430,12 +430,13 @@ public class Chunk {
block1.f(this.world, l1, j, i2, k1);
}
chunksection.setTypeId(i, j & 15, k, block);
// chunksection.setTypeId(i, j & 15, k, block); // CraftBukkit - Moved down
if (!this.world.isStatic) {
block1.remove(this.world, l1, j, i2, block1, k1);
} else if (block1 instanceof IContainer && block1 != block) {
this.world.p(l1, j, i2);
}
chunksection.setTypeId(i, j & 15, k, block); // CraftBukkit - Set new block after cleaning up old one
if (chunksection.getTypeId(i, j & 15, k) != block) {
return false;