From 7425e935f1d86f6a330eb7a600cf8cc65821cb2f Mon Sep 17 00:00:00 2001
From: "Luis C.M" <42545778+c0508383@users.noreply.github.com>
Date: Fri, 11 Nov 2022 16:57:06 -0600
Subject: [PATCH] EntityNPCInterface: -Fixed flying NPCs not returning to
 mid-air start y positions.

---
 .../npcs/entity/EntityNPCInterface.java       | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
index 140cdf5fa..1a7f6a60f 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -1335,15 +1335,19 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 		int j = getStartPos()[1];
 		int k = getStartPos()[2];
 		double yy = 0;
-		for (int ii = j; ii >= 0; ii--) {
-			Block block = worldObj.getBlock(i, ii, k);
-			if (block == null)
-				continue;
-			AxisAlignedBB bb = block.getCollisionBoundingBoxFromPool(worldObj, i, ii, k);
-			if (bb == null)
-				continue;
-			yy = bb.maxY;
-			break;
+		if (!this.canFly()) {
+			for (int ii = j; ii >= 0; ii--) {
+				Block block = worldObj.getBlock(i, ii, k);
+				if (block == null)
+					continue;
+				AxisAlignedBB bb = block.getCollisionBoundingBoxFromPool(worldObj, i, ii, k);
+				if (bb == null)
+					continue;
+				yy = bb.maxY;
+				break;
+			}
+		} else {
+			yy = j;
 		}
 		if (yy <= 0)
 			setDead();