Update to Minecraft 1.15

By: md_5 <git@md-5.net>
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 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> bA = DataWatcher.a(EntityVillagerAbstract.class, DataWatcherRegistry.b);
+     private static final DataWatcherObject<Integer> bx = 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);
-@@ -221,7 +236,16 @@
+@@ -231,7 +246,16 @@
             MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
 
             if (merchantrecipe != null) {