From 8e9d2fedc5c53bd5f30837df62cafd19ee3fd7c7 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Mon, 19 Jan 2026 16:29:24 -0500
Subject: [PATCH] Hitbox Fixes

---
 src/main/java/noppes/npcs/entity/EntityNPCInterface.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
index bf382e768..5b43aa68a 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -1297,6 +1297,11 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
         this.setRevengeTarget(null);
         this.deathTime = 0;
         //fleeingTick = 0;
+
+        // Restore hitbox before moving entity to prevent bounding box validation issues
+        currentAnimation = EnumAnimation.NONE;
+        updateHitbox();
+
         if (ais.returnToStart && !hasOwner() && !this.isRemote())
             setLocationAndAngles(getStartXPos(), getStartYPos(), getStartZPos(), rotationYaw, rotationPitch);
         killedtime = 0;
@@ -1310,8 +1315,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
         }
         moveEntityWithHeading(0, 0);
         distanceWalkedModified = 0;
-        currentAnimation = EnumAnimation.NONE;
-        updateHitbox();
         updateAI = true;
         ais.movingPos = 0;
         if (getOwner() != null) {