Update to Minecraft 1.11

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

paper-server/nms-patches/ContainerMerchant.patch

@@ -1,14 +1,13 @@
 --- a/net/minecraft/server/ContainerMerchant.java
 +++ b/net/minecraft/server/ContainerMerchant.java
-@@ -1,6 +1,7 @@
+@@ -1,11 +1,26 @@
  package net.minecraft.server;
  
- import javax.annotation.Nullable;
 +import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit
- 
++
  public class ContainerMerchant extends Container {
  
-@@ -8,6 +9,19 @@
+     private final IMerchant merchant;
      private final InventoryMerchant f;
      private final World g;
  
@@ -28,7 +27,7 @@
      public ContainerMerchant(PlayerInventory playerinventory, IMerchant imerchant, World world) {
          this.merchant = imerchant;
          this.g = world;
-@@ -15,6 +29,7 @@
+@@ -13,6 +28,7 @@
          this.a(new Slot(this.f, 0, 36, 53));
          this.a(new Slot(this.f, 1, 62, 53));
          this.a((Slot) (new SlotMerchantResult(playerinventory.player, imerchant, this.f, 2, 120, 53)));