Update to Minecraft 1.11

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

paper-server/nms-patches/InventoryMerchant.patch

@@ -3,7 +3,7 @@
 @@ -1,6 +1,13 @@
  package net.minecraft.server;
  
- import javax.annotation.Nullable;
+ import java.util.Iterator;
 +// CraftBukkit start
 +import java.util.List;
 +import org.bukkit.Location;
@@ -22,7 +22,7 @@
 +    public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 +    private int maxStack = MAX_STACK;
 +
-+    public ItemStack[] getContents() {
++    public List<ItemStack> getContents() {
 +        return this.itemsInSlots;
 +    }
 +
@@ -53,9 +53,9 @@
 +    // CraftBukkit end
 +
      public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
+         this.itemsInSlots = NonNullList.a(3, ItemStack.a);
          this.player = entityhuman;
-         this.merchant = imerchant;
-@@ -73,7 +114,7 @@
+@@ -89,7 +130,7 @@
      }
  
      public int getMaxStackSize() {