Repackage NMS

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

paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch

@@ -1,8 +1,8 @@
---- a/net/minecraft/server/EntityVillagerTrader.java
-+++ b/net/minecraft/server/EntityVillagerTrader.java
-@@ -3,6 +3,13 @@
- import java.util.EnumSet;
- import javax.annotation.Nullable;
+--- a/net/minecraft/world/entity/npc/EntityVillagerTrader.java
++++ b/net/minecraft/world/entity/npc/EntityVillagerTrader.java
+@@ -46,6 +46,13 @@
+ import net.minecraft.world.level.World;
+ import net.minecraft.world.phys.Vec3D;
  
 +// CraftBukkit start
 +import org.bukkit.Bukkit;
@@ -14,7 +14,7 @@
  public class EntityVillagerTrader extends EntityVillagerAbstract {
  
      @Nullable
-@@ -12,6 +19,7 @@
+@@ -55,6 +62,7 @@
      public EntityVillagerTrader(EntityTypes<? extends EntityVillagerTrader> entitytypes, World world) {
          super(entitytypes, world);
          this.attachedToPlayer = true;
@@ -22,7 +22,7 @@
      }
  
      @Override
-@@ -89,7 +97,16 @@
+@@ -132,7 +140,16 @@
              MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
  
              if (merchantrecipe != null) {