diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/Spawn.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
index d609d5040f..7f58021df8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
@@ -462,7 +462,7 @@ public class Spawn
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
index d609d5040f..7f58021df8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
@@ -462,7 +462,7 @@ public class Spawn
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Spawn.java
index 5d6d2b7e3e..34dfe07c02 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -402,7 +402,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java
index 97bcbba528..587fcfba72 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -402,7 +402,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/Spawn.java
index 5ba9f6db62..cbd0dc2071 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -408,7 +408,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
 		}
 		
 		// Correct Z of monsters.
-		if (!npc.isFlying() && (water == null))
+		if (npc.isMonster() && !npc.isFlying() && (water == null))
 		{
 			// Do not correct Z distances greater than 300.
 			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);