Updated CraftBukkit to 1.2

src/main/java/net/minecraft/server/TileEntityDispenser.java

@@ -68,7 +68,18 @@ public class TileEntityDispenser extends TileEntity implements IInventory {
         }
     }
 
-    // CraftBukkit - change signature
+    public ItemStack splitWithoutUpdate(int i) {
+        if (this.items[i] != null) {
+            ItemStack itemstack = this.items[i];
+
+            this.items[i] = null;
+            return itemstack;
+        } else {
+            return null;
+        }
+    }
+
+    // CraftBukkit start - move code out from p_
     public int findDispenseSlot() {
         int i = -1;
         int j = 1;
@@ -79,12 +90,10 @@ public class TileEntityDispenser extends TileEntity implements IInventory {
                 i = k;
             }
         }
-
-        // CraftBukkit start
         return i;
     }
 
-    public ItemStack k_() {
+    public ItemStack p_() {
         int i = this.findDispenseSlot();
         // CraftBukkit end
 
@@ -105,7 +114,7 @@ public class TileEntityDispenser extends TileEntity implements IInventory {
     }
 
     public String getName() {
-        return "Trap";
+        return "container.dispenser";
     }
 
     public void a(NBTTagCompound nbttagcompound) {