1 files changed, 56 insertions, 0 deletions
diff --git a/nms-patches/DispenseBehaviorTNT.patch b/nms-patches/DispenseBehaviorTNT.patch
new file mode 100644
index 00000000..1dd1d42c
--- /dev/null
+++ b/nms-patches/DispenseBehaviorTNT.patch
@@ -0,0 +1,56 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/DispenseBehaviorTNT.java	2014-11-27 08:59:46.645422093 +1100
++++ src/main/java/net/minecraft/server/DispenseBehaviorTNT.java	2014-11-27 08:42:10.140850934 +1100
+@@ -1,5 +1,10 @@
+ package net.minecraft.server;
+ 
++// CraftBukkit start
++import org.bukkit.craftbukkit.inventory.CraftItemStack;
++import org.bukkit.event.block.BlockDispenseEvent;
++// CraftBukkit end
++
+ final class DispenseBehaviorTNT extends DispenseBehaviorItem {
+ 
+     DispenseBehaviorTNT() {}
+@@ -7,11 +12,40 @@
+     protected ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) {
+         World world = isourceblock.i();
+         BlockPosition blockposition = isourceblock.getBlockPosition().shift(BlockDispenser.b(isourceblock.f()));
+-        EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, (EntityLiving) null);
++        // EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, (EntityLiving) null);
++        
++        // CraftBukkit start
++        ItemStack itemstack1 = itemstack.a(1);
++        org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
++        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
++
++        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX() + 0.5, blockposition.getY() + 0.5, blockposition.getZ() + 0.5));
++        if (!BlockDispenser.eventFired) {
++            world.getServer().getPluginManager().callEvent(event);
++        }
++
++        if (event.isCancelled()) {
++            itemstack.count++;
++            return itemstack;
++        }
++
++        if (!event.getItem().equals(craftItem)) {
++            itemstack.count++;
++            // Chain to handler for new item
++            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
++            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.M.get(eventStack.getItem());
++            if (idispensebehavior != IDispenseBehavior.a && idispensebehavior != this) {
++                idispensebehavior.a(isourceblock, eventStack);
++                return itemstack;
++            }
++        }
++
++        EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), (EntityLiving) null);
++        // CraftBukkit end
+ 
+         world.addEntity(entitytntprimed);
+         world.makeSound(entitytntprimed, "game.tnt.primed", 1.0F, 1.0F);
+-        --itemstack.count;
++        // --itemstack.count; // CraftBukkit - handled above
+         return itemstack;
+     }
+ }