Repackage NMS

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

paper-server/nms-patches/net/minecraft/world/inventory/ContainerMerchant.patch

@@ -1,7 +1,8 @@
---- a/net/minecraft/server/ContainerMerchant.java
-+++ b/net/minecraft/server/ContainerMerchant.java
-@@ -1,10 +1,25 @@
- package net.minecraft.server;
+--- a/net/minecraft/world/inventory/ContainerMerchant.java
++++ b/net/minecraft/world/inventory/ContainerMerchant.java
+@@ -12,11 +12,26 @@
+ import net.minecraft.world.item.trading.MerchantRecipe;
+ import net.minecraft.world.item.trading.MerchantRecipeList;
  
 +import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit
 +
@@ -26,7 +27,7 @@
      public ContainerMerchant(int i, PlayerInventory playerinventory) {
          this(i, playerinventory, new MerchantWrapper(playerinventory.player));
      }
-@@ -16,6 +31,7 @@
+@@ -28,6 +43,7 @@
          this.a(new Slot(this.inventoryMerchant, 0, 136, 37));
          this.a(new Slot(this.inventoryMerchant, 1, 162, 37));
          this.a((Slot) (new SlotMerchantResult(playerinventory.player, imerchant, this.inventoryMerchant, 2, 220, 37)));
@@ -34,7 +35,7 @@
  
          int j;
  
-@@ -96,7 +112,7 @@
+@@ -108,7 +124,7 @@
      }
  
      private void k() {