SPIGOT-4471: Use wall time for zombie drowning & enhance checks

Thanks Zach Brown for outline of issue with drowned zombies. By: md_5 <git@md-5.net>
2018-11-06 18:03:42 +11:00
parent 367a09407f
commit f41299cc66
2 changed files with 38 additions and 12 deletions
--- a/paper-server/nms-patches/EntityZombieVillager.patch
+++ b/paper-server/nms-patches/EntityZombieVillager.patch
@@ -8,9 +8,12 @@
 
     public EntityZombieVillager(World world) {
         super(EntityTypes.ZOMBIE_VILLAGER, world);
-@@ -56,6 +57,11 @@
+@@ -54,8 +55,13 @@
+     }
+ 
     public void tick() {
-         if (!this.world.isClientSide && this.isConverting()) {
+-        if (!this.world.isClientSide && this.isConverting()) {
+        if (!this.world.isClientSide && this.isConverting() && this.isAlive()) { // CraftBukkit
             int i = this.dK();
 +            // CraftBukkit start - Use wall time instead of ticks for villager conversion
 +            int elapsedTicks = MinecraftServer.currentTick - this.lastTick;