Paper/nms-patches/InventoryMerchant.patch

--- a/net/minecraft/server/InventoryMerchant.java
+++ b/net/minecraft/server/InventoryMerchant.java
@@ -2,6 +2,13 @@
 
 import java.util.Iterator;
 import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.entity.CraftVillager;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
 
 public class InventoryMerchant implements IInventory {
 
@@ -11,6 +18,40 @@
     private MerchantRecipe recipe;
     public int selectedIndex;
 
+    // CraftBukkit start - add fields and methods
+    public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+    private int maxStack = MAX_STACK;
+
+    public List<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 (merchant instanceof EntityVillager) ? (CraftVillager) ((EntityVillager) this.merchant).getBukkitEntity() : null;
+    }
+
+    @Override
+    public Location getLocation() {
+        return (merchant instanceof EntityVillager) ? ((EntityVillager) this.merchant).getBukkitEntity().getLocation() : null;
+    }
+    // CraftBukkit end
+
     public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
         this.itemsInSlots = NonNullList.a(3, ItemStack.a);
         this.player = entityhuman;
@@ -78,7 +119,7 @@
     }
 
     public IChatBaseComponent getDisplayName() {
-        return new ChatMessage("mob.villager", new Object[0]);
+        return merchant.getScoreboardDisplayName(); // CraftBukkit
     }
 
     public boolean hasCustomName() {
@@ -91,7 +132,7 @@
     }
 
     public int getMaxStackSize() {
-        return 64;
+        return maxStack; // CraftBukkit
     }
 
     public boolean a(EntityHuman entityhuman) {