SPIGOT-5208: Reset state on cancelled EntityTransformEvent to prevent event spam

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-07-26 09:58:18 +10:00
parent 526ee7e53e
commit 48e0a2b15c
4 changed files with 24 additions and 19 deletions

View File

@@ -6,6 +6,7 @@ import java.util.UUID;
import net.minecraft.server.EntityZombieVillager;
import net.minecraft.server.IRegistry;
import net.minecraft.server.MinecraftKey;
import net.minecraft.server.MobEffects;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
@@ -65,6 +66,7 @@ public class CraftVillagerZombie extends CraftZombie implements ZombieVillager {
getHandle().getDataWatcher().set(EntityZombieVillager.CONVERTING, false);
getHandle().persistent = false; // CraftBukkit - SPIGOT-4684 update persistence
getHandle().conversionPlayer = null;
getHandle().removeEffect(MobEffects.INCREASE_DAMAGE, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
} else {
getHandle().startConversion((UUID) null, time);
}