PaperMC/nms-patches/EntityZombieVillager.patch

--- a/net/minecraft/server/EntityZombieVillager.java
+++ b/net/minecraft/server/EntityZombieVillager.java
@@ -5,6 +5,11 @@
 import java.util.UUID;
 import javax.annotation.Nullable;
 import org.apache.logging.log4j.Logger;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.entity.ZombieVillager;
+import org.bukkit.event.entity.EntityTransformEvent;
+// CraftBukkit end
 
 public class EntityZombieVillager extends EntityZombie implements VillagerDataHolder {
 
@@ -15,6 +20,7 @@
     private NBTBase bw;
     private NBTTagCompound bx;
     private int by;
+    private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
 
     public EntityZombieVillager(EntityTypes<? extends EntityZombieVillager> entitytypes, World world) {
         super(entitytypes, world);
@@ -31,7 +37,7 @@
     @Override
     public void saveData(NBTTagCompound nbttagcompound) {
         super.saveData(nbttagcompound);
-        DataResult dataresult = VillagerData.a.encodeStart(DynamicOpsNBT.a, this.getVillagerData());
+        DataResult<NBTBase> dataresult = VillagerData.a.encodeStart(DynamicOpsNBT.a, this.getVillagerData()); // CraftBukkit - decompile error
         Logger logger = EntityZombieVillager.LOGGER;
 
         logger.getClass();
@@ -87,6 +93,10 @@
     public void tick() {
         if (!this.world.isClientSide && this.isAlive() && this.isConverting()) {
             int i = this.getConversionProgress();
+            // CraftBukkit start - Use wall time instead of ticks for villager conversion
+            int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
+            i *= elapsedTicks;
+            // CraftBukkit end
 
             this.conversionTime -= i;
             if (this.conversionTime <= 0) {
@@ -95,6 +105,7 @@
         }
 
         super.tick();
+        this.lastTick = MinecraftServer.currentTick; // CraftBukkit
     }
 
     @Override
@@ -138,8 +149,11 @@
         this.conversionPlayer = 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);
     }
 
@@ -181,7 +195,7 @@
             entityvillager.setAgeRaw(-24000);
         }
 
-        this.die();
+        // this.die(); // CraftBukkit - moved down
         entityvillager.setNoAI(this.isNoAI());
         if (this.hasCustomName()) {
             entityvillager.setCustomName(this.getCustomName());
@@ -193,7 +207,14 @@
         }
 
         entityvillager.setInvulnerable(this.isInvulnerable());
-        worldserver.addEntity(entityvillager);
+        // CraftBukkit start
+        if (CraftEventFactory.callEntityTransformEvent(this, entityvillager, EntityTransformEvent.TransformReason.CURED).isCancelled()) {
+            ((ZombieVillager) getBukkitEntity()).setConversionTime(-1); // SPIGOT-5208: End conversion to stop event spam
+            return;
+        }
+        this.die(); // CraftBukkit - from above
+        worldserver.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
+        // CraftBukkit end
         if (this.conversionPlayer != null) {
             EntityHuman entityhuman = worldserver.b(this.conversionPlayer);
 
@@ -203,7 +224,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
         if (!this.isSilent()) {
             worldserver.a((EntityHuman) null, 1027, this.getChunkCoordinates(), 0);
         }