1 files changed, 0 insertions, 65 deletions
diff --git a/nms-patches/DispenseBehaviorFilledBucket.patch b/nms-patches/DispenseBehaviorFilledBucket.patch
deleted file mode 100644
index 4fb80b2a..00000000
--- a/nms-patches/DispenseBehaviorFilledBucket.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/DispenseBehaviorFilledBucket.java	2014-11-28 17:43:43.041707436 +0000
-+++ src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java	2014-11-28 17:38:22.000000000 +0000
-@@ -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 DispenseBehaviorFilledBucket extends DispenseBehaviorItem {
- 
-     private final DispenseBehaviorItem b = new DispenseBehaviorItem();
-@@ -9,10 +14,49 @@
-     public ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) {
-         ItemBucket itembucket = (ItemBucket) itemstack.getItem();
-         BlockPosition blockposition = isourceblock.getBlockPosition().shift(BlockDispenser.b(isourceblock.f()));
-+                
-+        // CraftBukkit start
-+        World world = isourceblock.i();
-+        int x = blockposition.getX();
-+        int y = blockposition.getY();
-+        int z = blockposition.getZ();
-+        if (world.isEmpty(blockposition) || !world.getType(blockposition).getBlock().getMaterial().isBuildable()) {
-+            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(x, y, z));
-+            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;
-+                }
-+            }
-+
-+            itembucket = (ItemBucket) CraftItemStack.asNMSCopy(event.getItem()).getItem();
-+        }
-+        // CraftBukkit end
- 
-         if (itembucket.a(isourceblock.i(), blockposition)) {
--            itemstack.setItem(Items.BUCKET);
--            itemstack.count = 1;
-+            // CraftBukkit start - Handle stacked buckets
-+            Item item = Items.BUCKET;
-+            if (--itemstack.count == 0) {
-+                itemstack.setItem(Items.BUCKET);
-+                itemstack.count = 1;
-+            } else if (((TileEntityDispenser) isourceblock.getTileEntity()).addItem(new ItemStack(item)) < 0) {
-+                this.b.a(isourceblock, new ItemStack(item));
-+            }
-+            // CraftBukkit end
-             return itemstack;
-         } else {
-             return this.b.a(isourceblock, itemstack);