From d47849df8c4bee23ac85897a41537142ab81ab7b Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Sat, 16 Mar 2013 07:38:54 -0500 Subject: [PATCH] Remove duplicate place logic for snow. Fixes BUKKIT-3756 --- src/main/java/net/minecraft/server/ItemSnow.java | 11 ++++++++--- 1 file 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 06cd5ca65a..5b104e947a 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);