Update to Minecraft 1.14.2

By: md_5 <git@md-5.net>
2019-05-28 06:30:00 +10:00
parent 5f2275f40a
commit 569660215f
57 changed files with 385 additions and 394 deletions
--- a/paper-server/nms-patches/EntityZombieVillager.patch
+++ b/paper-server/nms-patches/EntityZombieVillager.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/EntityZombieVillager.java
 +++ b/net/minecraft/server/EntityZombieVillager.java
-@@ -3,15 +3,20 @@
+@@ -3,6 +3,10 @@
 import com.mojang.datafixers.Dynamic;
 import java.util.UUID;
 import javax.annotation.Nullable;
@@ -11,11 +11,8 @@
 
 public class EntityZombieVillager extends EntityZombie implements VillagerDataHolder {
 
-     public static final DataWatcherObject<Boolean> CONVERTING = DataWatcher.a(EntityZombieVillager.class, DataWatcherRegistry.i);
-     private static final DataWatcherObject<VillagerData> c = DataWatcher.a(EntityZombieVillager.class, DataWatcherRegistry.q);
-     public int conversionTime;
-    private UUID conversionPlayer;
-+    public UUID conversionPlayer; // CraftBukkit - public
+@@ -12,6 +16,7 @@
+     public UUID conversionPlayer;
     private NBTTagCompound bB;
     private int bC;
 +    private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field