Update to Minecraft 1.8

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

1 files changed, 59 insertions, 0 deletions

diff --git a/nms-patches/DispenseBehaviorArmor.patch b/nms-patches/DispenseBehaviorArmor.patch
new file mode 100644
index 00000000..6c420e65
--- /dev/null
+++ b/nms-patches/DispenseBehaviorArmor.patch
@@ -0,0 +1,59 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/DispenseBehaviorArmor.java	2014-11-27 08:59:46.629422164 +1100
++++ src/main/java/net/minecraft/server/DispenseBehaviorArmor.java	2014-11-27 08:42:10.144850927 +1100
+@@ -3,6 +3,11 @@
+ import com.google.common.base.Predicates;
+ import java.util.List;
+ 
++// CraftBukkit start
++import org.bukkit.craftbukkit.inventory.CraftItemStack;
++import org.bukkit.event.block.BlockDispenseEvent;
++// CraftBukkit end
++
+ final class DispenseBehaviorArmor extends DispenseBehaviorItem {
+ 
+     DispenseBehaviorArmor() {}
+@@ -19,15 +24,42 @@
+             EntityLiving entityliving = (EntityLiving) list.get(0);
+             int l = entityliving instanceof EntityHuman ? 1 : 0;
+             int i1 = EntityInsentient.c(itemstack);
+-            ItemStack itemstack1 = itemstack.cloneItemStack();
++            
++            // CraftBukkit start
++            ItemStack itemstack1 = itemstack.a(1);
++            World world = isourceblock.i();
++            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(0, 0, 0));
++            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;
++                }
++            }
++            // CraftBukkit end
++            
+             itemstack1.count = 1;
+             entityliving.setEquipment(i1 - l, itemstack1);
+             if (entityliving instanceof EntityInsentient) {
+                 ((EntityInsentient) entityliving).a(i1, 2.0F);
+             }
+ 
+-            --itemstack.count;
++            // --itemstack.count; // CraftBukkit - handled above
+             return itemstack;
+         } else {
+             return super.b(isourceblock, itemstack);