1 files changed, 59 insertions, 0 deletions
diff --git a/nms-patches/InventoryMerchant.patch b/nms-patches/InventoryMerchant.patch
new file mode 100644
index 00000000..bc24b3dc
--- /dev/null
+++ b/nms-patches/InventoryMerchant.patch
@@ -0,0 +1,59 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/InventoryMerchant.java	2014-11-27 08:59:46.769421547 +1100
++++ src/main/java/net/minecraft/server/InventoryMerchant.java	2014-11-27 08:42:10.136850942 +1100
+@@ -1,5 +1,11 @@
+ package net.minecraft.server;
+ 
++// CraftBukkit start
++import java.util.List;
++import org.bukkit.craftbukkit.entity.CraftHumanEntity;
++import org.bukkit.entity.HumanEntity;
++// CraftBukkit end
++
+ public class InventoryMerchant implements IInventory {
+ 
+     private final IMerchant merchant;
+@@ -8,6 +14,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 player.getBukkitEntity();
++    }
++    // CraftBukkit end    
++    
+     public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
+         this.player = entityhuman;
+         this.merchant = imerchant;
+@@ -94,7 +129,7 @@
+     }
+ 
+     public int getMaxStackSize() {
+-        return 64;
++        return maxStack; // CraftBukkit
+     }
+ 
+     public boolean a(EntityHuman entityhuman) {