Update to Minecraft 1.18.2

By: md_5 <git@md-5.net>
2022-03-01 02:00:00 +11:00
parent bd40300a4f
commit 9ee989ea81
184 changed files with 1785 additions and 1785 deletions
--- a/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch
+++ b/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
-@@ -45,6 +45,13 @@
+@@ -44,6 +44,13 @@
 import net.minecraft.world.level.World;
 import net.minecraft.world.phys.Vec3D;
 
@@ -14,7 +14,7 @@
 public class EntityVillagerTrader extends EntityVillagerAbstract {
 
     private static final int NUMBER_OF_TRADE_OFFERS = 5;
-@@ -54,6 +61,7 @@
+@@ -53,6 +60,7 @@
 
     public EntityVillagerTrader(EntityTypes<? extends EntityVillagerTrader> entitytypes, World world) {
         super(entitytypes, world);
@@ -22,7 +22,7 @@
     }
 
     @Override
-@@ -131,7 +139,16 @@
+@@ -130,7 +138,16 @@
             MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.getOffer(this, this.random);
 
             if (merchantrecipe != null) {