From dd4b0c8b4b739f8c368da73736438bc7b2d9457a Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 28 Jun 2025 19:10:15 +0300 Subject: [PATCH] ActionManager no longer cleared on entity's death/reset --- src/main/java/noppes/npcs/ScriptPlayerEventHandler.java | 2 +- src/main/java/noppes/npcs/entity/EntityNPCInterface.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 8f8ffbb2f..26b638ac6 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -496,7 +496,7 @@ public class ScriptPlayerEventHandler { EntityPlayer player = (EntityPlayer) event.entityLiving; PlayerData playerData = PlayerData.get(player); - playerData.actionManager.clear(); + // playerData.actionManager.clear(); } if (event.source.getEntity() instanceof EntityPlayerMP) { diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index c79354347..6ff6961f0 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -1168,7 +1168,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti setHealth(getMaxHealth()); dataWatcher.updateObject(14, 0); // animation Normal dataWatcher.updateObject(15, 0); - actionManager.clear(); + // actionManager.clear(); combatHandler.reset(); this.setAttackTarget(null); this.setRevengeTarget(null);