Update CraftBukkit to Minecraft 1.5

1 files changed, 6 insertions, 11 deletions

diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java b/src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java
index 309c1e62..5caf0bde 100644
--- a/src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java
+++ b/src/main/java/net/minecraft/server/DispenseBehaviorFilledBucket.java
@@ -5,23 +5,18 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.event.block.BlockDispenseEvent;
 // CraftBukkit end
 
-public class DispenseBehaviorFilledBucket extends DispenseBehaviorItem {
+final class DispenseBehaviorFilledBucket extends DispenseBehaviorItem {
 
-    private final DispenseBehaviorItem c;
+    private final DispenseBehaviorItem b = new DispenseBehaviorItem();
 
-    final MinecraftServer b;
-
-    public DispenseBehaviorFilledBucket(MinecraftServer minecraftserver) {
-        this.b = minecraftserver;
-        this.c = new DispenseBehaviorItem();
-    }
+    DispenseBehaviorFilledBucket() {}
 
     public ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) {
         ItemBucket itembucket = (ItemBucket) itemstack.getItem();
         int i = isourceblock.getBlockX();
         int j = isourceblock.getBlockY();
         int k = isourceblock.getBlockZ();
-        EnumFacing enumfacing = EnumFacing.a(isourceblock.h());
+        EnumFacing enumfacing = BlockDispenser.j_(isourceblock.h());
 
         // CraftBukkit start
         World world = isourceblock.k();
@@ -61,13 +56,13 @@ public class DispenseBehaviorFilledBucket extends DispenseBehaviorItem {
                 itemstack.id = item.id;
                 itemstack.count = 1;
             } else if (((TileEntityDispenser) isourceblock.getTileEntity()).addItem(new ItemStack(item)) < 0) {
-                this.c.a(isourceblock, new ItemStack(item));
+                this.b.a(isourceblock, new ItemStack(item));
             }
             // CraftBukkit end
 
             return itemstack;
         } else {
-            return this.c.a(isourceblock, itemstack);
+            return this.b.a(isourceblock, itemstack);
         }
     }
 }