Update to Minecraft 1.21.2

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

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/npc/EntityVillagerTrader.java
 +++ b/net/minecraft/world/entity/npc/EntityVillagerTrader.java
-@@ -47,6 +47,14 @@
+@@ -48,6 +48,14 @@
  import net.minecraft.world.phys.Vec3D;
  import org.apache.commons.lang3.tuple.Pair;
  
@@ -12,10 +12,10 @@
 +import org.bukkit.event.entity.VillagerAcquireTradeEvent;
 +// CraftBukkit end
 +
- public class EntityVillagerTrader extends EntityVillagerAbstract {
+ public class EntityVillagerTrader extends EntityVillagerAbstract implements Consumable.b {
  
      private static final int NUMBER_OF_TRADE_OFFERS = 5;
-@@ -56,6 +64,7 @@
+@@ -57,6 +65,7 @@
  
      public EntityVillagerTrader(EntityTypes<? extends EntityVillagerTrader> entitytypes, World world) {
          super(entitytypes, world);
@@ -23,7 +23,7 @@
      }
  
      @Override
-@@ -136,7 +145,16 @@
+@@ -137,7 +146,16 @@
                  MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.getOffer(this, this.random);
  
                  if (merchantrecipe != null) {
@@ -41,7 +41,7 @@
                  }
  
              }
-@@ -243,7 +261,7 @@
+@@ -244,7 +262,7 @@
  
      private void maybeDespawn() {
          if (this.despawnDelay > 0 && !this.isTrading() && --this.despawnDelay == 0) {