Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 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
@@ -23,7 +23,7 @@
 
     @Override
@@ -131,7 +139,16 @@
-             MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
+             MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.getOffer(this, this.random);
 
             if (merchantrecipe != null) {
 -                merchantrecipelist.add(merchantrecipe);