1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index b8a7c07e..0da473ba 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -10,6 +10,7 @@ import org.bukkit.event.entity.EntityCombustEvent;
 public class EntityZombie extends EntityMonster {
 
     private int d = 0;
+    private int lastTick = MinecraftServer.currentTick; // CraftBukkit
 
     public EntityZombie(World world) {
         super(world);
@@ -119,6 +120,12 @@ public class EntityZombie extends EntityMonster {
         if (!this.world.isStatic && this.o()) {
             int i = this.q();
 
+            // CraftBukkit start - Use wall time instead of ticks for villager conversion
+            int elapsedTicks = Math.max(1, MinecraftServer.currentTick - this.lastTick);
+            this.lastTick = MinecraftServer.currentTick;
+            i *= elapsedTicks;
+            // CraftBukkit end
+
             this.d -= i;
             if (this.d <= 0) {
                 this.p();