Paper/nms-patches/InventoryMerchant.patch

--- ../work/decompile-8eb82bde/net/minecraft/server/InventoryMerchant.java	2015-02-06 20:41:38.537609199 +1100
+++ src/main/java/net/minecraft/server/InventoryMerchant.java	2015-02-06 20:41:38.537609199 +1100
@@ -1,5 +1,12 @@
 package net.minecraft.server;
 
+// CraftBukkit start
+import java.util.List;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.entity.CraftVillager;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
+
 public class InventoryMerchant implements IInventory {
 
     private final IMerchant merchant;
@@ -8,6 +15,35 @@
     private MerchantRecipe recipe;
     private int e;
 
+    // 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.itemsInSlots;
+    }
+
+    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 i) {
+        maxStack = i;
+    }
+
+    public org.bukkit.inventory.InventoryHolder getOwner() {
+        return (CraftVillager) ((EntityVillager) this.merchant).getBukkitEntity();
+    }
+    // CraftBukkit end    
+    
     public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
         this.player = entityhuman;
         this.merchant = imerchant;
@@ -94,7 +130,7 @@
     }
 
     public int getMaxStackSize() {
-        return 64;
+        return maxStack; // CraftBukkit
     }
 
     public boolean a(EntityHuman entityhuman) {