diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-16 07:38:54 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-16 07:38:54 -0500 |
commit | d47849df8c4bee23ac85897a41537142ab81ab7b (patch) | |
tree | a29c26da1dee2e1bec75eff1e33f0bd1b442ecab | |
parent | 2cb9cbf05cc7cefdf646f0d2b4bc4c2d94afd28d (diff) | |
download | craftbukkit-d47849df8c4bee23ac85897a41537142ab81ab7b.tar craftbukkit-d47849df8c4bee23ac85897a41537142ab81ab7b.tar.gz craftbukkit-d47849df8c4bee23ac85897a41537142ab81ab7b.tar.lz craftbukkit-d47849df8c4bee23ac85897a41537142ab81ab7b.tar.xz craftbukkit-d47849df8c4bee23ac85897a41537142ab81ab7b.zip |
Remove duplicate place logic for snow. Fixes BUKKIT-3756
-rw-r--r-- | src/main/java/net/minecraft/server/ItemSnow.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/ItemSnow.java b/src/main/java/net/minecraft/server/ItemSnow.java index 06cd5ca6..5b104e94 100644 --- a/src/main/java/net/minecraft/server/ItemSnow.java +++ b/src/main/java/net/minecraft/server/ItemSnow.java @@ -20,14 +20,19 @@ public class ItemSnow extends ItemBlockWithAuxData { int j1 = world.getData(i, j, k); int k1 = j1 & 7; - // CraftBukkit start - // if (k1 <= 6 && world.b(block.b(world, i, j, k)) && world.setData(i, j, k, k1 + 1 | j1 & -8, 2)) { - if (k1 <= 6 && world.b(block.b(world, i, j, k)) && processBlockPlace(world, entityhuman, itemstack, i, j, k, Block.SNOW.id, k1 + 1 | j1 & -8, clickedX, clickedY, clickedZ)) { + // CraftBukkit start - redirect to common handler + if (k1 <= 6 && world.b(block.b(world, i, j, k)) && ItemBlock.processBlockPlace(world, entityhuman, itemstack, i, j, k, Block.SNOW.id, k1 + 1 | j1 & -8, clickedX, clickedY, clickedZ)) { + return true; + } + /* + if (k1 <= 6 && world.b(block.b(world, i, j, k)) && world.setData(i, j, k, k1 + 1 | j1 & -8, 2)) { // CraftBukkit end world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.getPlaceSound(), (block.stepSound.getVolume1() + 1.0F) / 2.0F, block.stepSound.getVolume2() * 0.8F); --itemstack.count; return true; } + */ + // CraftBukkit end } return super.interactWith(itemstack, entityhuman, world, i, j, k, l, f, f1, f2); |