From 8612d4442ae37e4b3af8324a32ce1dda4d40ccf8 Mon Sep 17 00:00:00 2001
From: KAMKEEL <28842281+KAMKEEL@users.noreply.github.com>
Date: Thu, 13 Aug 2026 06:06:14 -0400
Subject: [PATCH] Restore the npc step height even if the hitbox nudge throws

---
 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 b5d97e0f0..4ef245485 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -1343,8 +1343,11 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
             // npc up onto whatever it now touches. Only the horizontal push is wanted here.
             float prevStepHeight = this.stepHeight;
             this.stepHeight = 0.0F;
-            this.moveEntity(oldWidth - newWidth, 0.0D, oldWidth - newWidth);
-            this.stepHeight = prevStepHeight;
+            try {
+                this.moveEntity(oldWidth - newWidth, 0.0D, oldWidth - newWidth);
+            } finally {
+                this.stepHeight = prevStepHeight;
+            }
         }
     }