--- a/net/minecraft/server/TileEntityDispenser.java
+++ b/net/minecraft/server/TileEntityDispenser.java
@@ -3,12 +3,44 @@
 import java.util.Random;
 import javax.annotation.Nullable;
 
+// CraftBukkit start
+import java.util.List;
+
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
+
 public class TileEntityDispenser extends TileEntityLootable implements IInventory {
 
     private static final Random f = new Random();
     private ItemStack[] items = new ItemStack[9];
     protected String a;
 
+    // CraftBukkit start - add fields and methods
+    public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+    private int maxStack = MAX_STACK;
+
+    public ItemStack[] getContents() {
+        return this.items;
+    }
+
+    public void onOpen(CraftHumanEntity who) {
+        transaction.add(who);
+    }
+
+    public void onClose(CraftHumanEntity who) {
+        transaction.remove(who);
+    }
+
+    public List<HumanEntity> getViewers() {
+        return transaction;
+    }
+
+    public void setMaxStackSize(int size) {
+        maxStack = size;
+    }
+    // CraftBukkit end
+
     public TileEntityDispenser() {}
 
     public int getSize() {
@@ -46,6 +78,7 @@
 
         for (int k = 0; k < this.items.length; ++k) {
             if (this.items[k] != null && TileEntityDispenser.f.nextInt(j++) == 0) {
+                if (this.items[k].count == 0) continue; // CraftBukkit
                 i = k;
             }
         }
@@ -139,7 +172,7 @@
     }
 
     public int getMaxStackSize() {
-        return 64;
+        return maxStack; // CraftBukkit
     }
 
     public boolean a(EntityHuman entityhuman) {