From cc39e62bd444a72a57d31b14bdb199c44954fe70 Mon Sep 17 00:00:00 2001
From: KAMKEEL <KamronVaswani@gmail.com>
Date: Mon, 7 Nov 2022 21:23:46 -0500
Subject: [PATCH] Fix Reset Flying NPC to Spawn POINT

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

diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
index ae29a9a9a..121d9f607 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -1059,12 +1059,14 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		killedtime = 0;
 		extinguish();
 		this.clearActivePotions();
-		moveEntityWithHeading(0,0);
-		distanceWalkedModified = 0;
 		getNavigator().clearPathEntity();
-		if(canFly()){
+		if(this.canFly()){
+			((PathNavigateFlying)getNavigator()).targetPos = null;
+			((PathNavigateFlying)getNavigator()).clearPathEntity();
 			((FlyingMoveHelper)getMoveHelper()).update = false;
 		}
+		moveEntityWithHeading(0,0);
+		distanceWalkedModified = 0;
 		currentAnimation = EnumAnimation.NONE;
 		updateHitbox();
 		updateAI = true;