Update to Minecraft 1.20.2

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

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/npc/EntityVillagerAbstract.java
 +++ b/net/minecraft/world/entity/npc/EntityVillagerAbstract.java
-@@ -36,8 +36,24 @@
+@@ -35,8 +35,24 @@
  import net.minecraft.world.level.pathfinder.PathType;
  import net.minecraft.world.phys.Vec3D;
  
@@ -25,7 +25,7 @@
      private static final DataWatcherObject<Integer> DATA_UNHAPPY_COUNTER = DataWatcher.defineId(EntityVillagerAbstract.class, DataWatcherRegistry.INT);
      public static final int VILLAGER_SLOT_OFFSET = 300;
      private static final int VILLAGER_INVENTORY_SIZE = 8;
-@@ -45,7 +61,7 @@
+@@ -44,7 +60,7 @@
      private EntityHuman tradingPlayer;
      @Nullable
      protected MerchantRecipeList offers;
@@ -34,8 +34,8 @@
  
      public EntityVillagerAbstract(EntityTypes<? extends EntityVillagerAbstract> entitytypes, World world) {
          super(entitytypes, world);
-@@ -247,7 +263,16 @@
-             MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.getOffer(this, this.random);
+@@ -233,7 +249,16 @@
+             MerchantRecipe merchantrecipe = ((VillagerTrades.IMerchantRecipeOption) arraylist.remove(this.random.nextInt(arraylist.size()))).getOffer(this, this.random);
  
              if (merchantrecipe != null) {
 -                merchantrecipelist.add(merchantrecipe);
@@ -49,6 +49,6 @@
 +                    merchantrecipelist.add(CraftMerchantRecipe.fromBukkit(event.getRecipe()).toMinecraft());
 +                }
 +                // CraftBukkit end
+                 ++j;
              }
          }
-