Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/

1 files changed, 57 insertions, 0 deletions

diff --git a/nms-patches/DispenseBehaviorFlintAndSteel.patch b/nms-patches/DispenseBehaviorFlintAndSteel.patch
new file mode 100644
index 00000000..26ab2df0
--- /dev/null
+++ b/nms-patches/DispenseBehaviorFlintAndSteel.patch
@@ -0,0 +1,57 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/DispenseBehaviorFlintAndSteel.java	2014-11-27 08:59:46.641422111 +1100
++++ src/main/java/net/minecraft/server/DispenseBehaviorFlintAndSteel.java	2014-11-27 08:42:10.168850880 +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 DispenseBehaviorFlintAndSteel extends DispenseBehaviorItem {
+ 
+     private boolean b = true;
+@@ -10,11 +15,39 @@
+         World world = isourceblock.i();
+         BlockPosition blockposition = isourceblock.getBlockPosition().shift(BlockDispenser.b(isourceblock.f()));
+ 
+-        if (world.isEmpty(blockposition)) {
+-            world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+-            if (itemstack.isDamaged(1, world.random)) {
+-                itemstack.count = 0;
++        // CraftBukkit start
++        org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
++        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
++
++        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
++        if (!BlockDispenser.eventFired) {
++            world.getServer().getPluginManager().callEvent(event);
++        }
++
++        if (event.isCancelled()) {
++            return itemstack;
++        }
++
++        if (!event.getItem().equals(craftItem)) {
++            // 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;
++            }
++        }
++        // CraftBukkit end        
++        
++        if (world.isEmpty(blockposition)) {            
++            // CraftBukkit start - Ignition by dispensing flint and steel
++            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ()).isCancelled()) {
++                world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
++                if (itemstack.isDamaged(1, world.random)) {
++                    itemstack.count = 0;
++                }
+             }
++            // CraftBukkit end
+         } else if (world.getType(blockposition).getBlock() == Blocks.TNT) {
+             Blocks.TNT.postBreak(world, blockposition, Blocks.TNT.getBlockData().set(BlockTNT.EXPLODE, Boolean.valueOf(true)));
+             world.setAir(blockposition);