Update to Minecraft 1.16.1

By: md_5 <git@md-5.net>
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions
--- a/paper-server/nms-patches/EntityVillagerAbstract.patch
+++ b/paper-server/nms-patches/EntityVillagerAbstract.patch
@@ -22,7 +22,7 @@
 +        return (craftMerchant == null) ? craftMerchant = new CraftMerchant(this) : craftMerchant;
 +    }
 +    // CraftBukkit end
-     private static final DataWatcherObject<Integer> bx = DataWatcher.a(EntityVillagerAbstract.class, DataWatcherRegistry.b);
+     private static final DataWatcherObject<Integer> bw = DataWatcher.a(EntityVillagerAbstract.class, DataWatcherRegistry.b);
     @Nullable
     private EntityHuman tradingPlayer;
     @Nullable
@@ -32,7 +32,7 @@
 
     public EntityVillagerAbstract(EntityTypes<? extends EntityVillagerAbstract> entitytypes, World world) {
         super(entitytypes, world);
-@@ -231,7 +246,16 @@
+@@ -214,7 +229,16 @@
             MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
 
             if (merchantrecipe != null) {