Throw BlockPlaceEvent when placing double slabs. Fixes BUKKIT-2469

1 files changed, 19 insertions, 2 deletions

diff --git a/src/main/java/net/minecraft/server/ItemStep.java b/src/main/java/net/minecraft/server/ItemStep.java
index 8501394c..7ef9a813 100644
--- a/src/main/java/net/minecraft/server/ItemStep.java
+++ b/src/main/java/net/minecraft/server/ItemStep.java
@@ -37,7 +37,18 @@ public class ItemStep extends ItemBlock {
             boolean flag = (j1 & 8) != 0;
 
             if ((l == 1 && !flag || l == 0 && flag) && i1 == this.b.id && k1 == itemstack.getData()) {
-                return super.interactWith(itemstack, entityhuman, world, i, j, k, -1, f, f1, f2); // CraftBukkit - handle this in super
+                // CraftBukkit start - handle in processBlockPlace()
+                /*
+                if (world.b(this.c.e(world, i, j, k)) && world.setTypeIdAndData(i, j, k, this.c.id, k1)) {
+                    world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.c.stepSound.getPlaceSound(), (this.c.stepSound.getVolume1() + 1.0F) / 2.0F, this.c.stepSound.getVolume2() * 0.8F);
+                    --itemstack.count;
+                }
+                */
+                if (world.b(this.c.e(world, i, j, k))) {
+                    processBlockPlace(world, entityhuman, itemstack, i, j, k, this.c.id, k1);
+                }
+                // CraftBukkit end
+                return true;
             } else {
                 return this.a(itemstack, entityhuman, world, i, j, k, l) ? true : super.interactWith(itemstack, entityhuman, world, i, j, k, l, f, f1, f2);
             }
@@ -74,11 +85,17 @@ public class ItemStep extends ItemBlock {
         int k1 = j1 & 7;
 
         if (i1 == this.b.id && k1 == itemstack.getData()) {
+            // CraftBukkit start - handle in processBlockPlace()
+            /*
             if (world.b(this.c.e(world, i, j, k)) && world.setTypeIdAndData(i, j, k, this.c.id, k1)) {
                 world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.c.stepSound.getPlaceSound(), (this.c.stepSound.getVolume1() + 1.0F) / 2.0F, this.c.stepSound.getVolume2() * 0.8F);
                 --itemstack.count;
             }
-
+            */
+            if (world.b(this.c.e(world, i, j, k))) {
+                processBlockPlace(world, entityhuman, itemstack, i, j, k, this.c.id, k1);
+            }
+            // CraftBukkit end
             return true;
         } else {
             return false;