From c57e45dcdc6493e1f0b60ff53de280b3a5a118f3 Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Fri, 20 Dec 2013 16:40:28 -0600 Subject: [PATCH] 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. --- src/main/java/net/minecraft/server/Chunk.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index 95b4704959..014136c18f 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -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;