Minecraft 1.9.4

By: md_5 <git@md-5.net>

paper-server/nms-patches/InventoryMerchant.patch

@@ -1,8 +1,9 @@
 --- a/net/minecraft/server/InventoryMerchant.java
 +++ b/net/minecraft/server/InventoryMerchant.java
-@@ -1,12 +1,54 @@
+@@ -1,6 +1,13 @@
  package net.minecraft.server;
  
+ import javax.annotation.Nullable;
 +// CraftBukkit start
 +import java.util.List;
 +import org.bukkit.Location;
@@ -10,16 +11,13 @@
 +import org.bukkit.craftbukkit.entity.CraftVillager;
 +import org.bukkit.entity.HumanEntity;
 +// CraftBukkit end
-+
+ 
  public class InventoryMerchant implements IInventory {
  
-     private final IMerchant merchant;
-     private ItemStack[] itemsInSlots = new ItemStack[3];
-     private final EntityHuman player;
+@@ -10,6 +17,40 @@
      private MerchantRecipe recipe;
--    private int e;
-+    public int e; // PAIL: private -> public, selectedIndex
-+
+     public int selectedIndex;
+ 
 +    // CraftBukkit start - add fields and methods
 +    public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 +    private int maxStack = MAX_STACK;
@@ -53,10 +51,11 @@
 +        return ((EntityVillager) this.merchant).getBukkitEntity().getLocation();
 +    }
 +    // CraftBukkit end
- 
++
      public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
          this.player = entityhuman;
-@@ -68,7 +110,7 @@
+         this.merchant = imerchant;
+@@ -73,7 +114,7 @@
      }
  
      public int getMaxStackSize() {