Paper/nms-patches/EntityZombieVillager.patch

--- a/net/minecraft/server/EntityZombieVillager.java
+++ b/net/minecraft/server/EntityZombieVillager.java
@@ -2,6 +2,10 @@
 
 import java.util.UUID;
 import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityTransformEvent;
+// CraftBukkit end
 
 public class EntityZombieVillager extends EntityZombie {
 
@@ -9,6 +13,7 @@
     private static final DataWatcherObject<Integer> b = DataWatcher.a(EntityZombieVillager.class, DataWatcherRegistry.b);
     public int conversionTime;
     private UUID bD;
+    private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
 
     public EntityZombieVillager(World world) {
         super(EntityTypes.ZOMBIE_VILLAGER, world);
@@ -54,8 +59,13 @@
     }
 
     public void tick() {
-        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;
+            this.lastTick = MinecraftServer.currentTick;
+            i *= elapsedTicks;
+            // CraftBukkit end
 
             this.conversionTime -= i;
             if (this.conversionTime <= 0) {
@@ -100,8 +110,11 @@
         this.bD = uuid;
         this.conversionTime = i;
         this.getDataWatcher().set(EntityZombieVillager.CONVERTING, true);
-        this.removeEffect(MobEffects.WEAKNESS);
-        this.addEffect(new MobEffect(MobEffects.INCREASE_DAMAGE, i, Math.min(this.world.getDifficulty().a() - 1, 0)));
+        // CraftBukkit start
+        this.persistent = true; // CraftBukkit - SPIGOT-4684 update persistence
+        this.removeEffect(MobEffects.WEAKNESS, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
+        this.addEffect(new MobEffect(MobEffects.INCREASE_DAMAGE, i, Math.min(this.world.getDifficulty().a() - 1, 0)), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
+        // CraftBukkit end
         this.world.broadcastEntityEffect(this, (byte) 16);
     }
 
@@ -116,14 +129,20 @@
             entityvillager.setAgeRaw(-24000);
         }
 
-        this.world.kill(this);
+        // this.world.kill(this); // CraftBukkit - moved down
         entityvillager.setNoAI(this.isNoAI());
         if (this.hasCustomName()) {
             entityvillager.setCustomName(this.getCustomName());
             entityvillager.setCustomNameVisible(this.getCustomNameVisible());
         }
 
-        this.world.addEntity(entityvillager);
+        // CraftBukkit start
+        if (CraftEventFactory.callEntityTransformEvent(this, entityvillager, EntityTransformEvent.TransformReason.CURED).isCancelled()) {
+            return;
+        }
+        this.world.kill(this); // CraftBukkit - from above
+        this.world.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
+        // CraftBukkit end
         if (this.bD != null) {
             EntityHuman entityhuman = this.world.b(this.bD);
 
@@ -132,7 +151,7 @@
             }
         }
 
-        entityvillager.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0));
+        entityvillager.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION); // CraftBukkit
         this.world.a((EntityHuman) null, 1027, new BlockPosition((int) this.locX, (int) this.locY, (int) this.locZ), 0);
     }