From 18800e1b6533aa77ea3a470d218b67f29c40527e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 12 Mar 2021 14:14:47 +0000
Subject: [PATCH] Increased spawn z values by a fixed value (64) to fix spawn
 zone issues.

---
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/spawn/Spawn.java        | 2 +-
 .../java/org/l2jmobius/gameserver/model/spawn/Spawn.java        | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 .../java/org/l2jmobius/gameserver/model/Spawn.java              | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 2b50939303..27ac21ef91 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
@@ -445,7 +445,7 @@ public class Spawn
 		// Correct Z of monsters. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true) < 300)
 			{
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 2b50939303..27ac21ef91 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
@@ -445,7 +445,7 @@ public class Spawn
 		// Correct Z of monsters. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true) < 300)
 			{
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 3c8357a703..3eb2e322c4 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 db2c4127f0..12ce64a85a 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{
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 eb57e4e69b..aa9995dbfa 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. Do not correct Z of flying NPCs.
 		if (npc.isMonster() && !npc.isFlying())
 		{
-			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
+			final int geoZ = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz) + 64;
 			// Do not correct Z distances greater than 300.
 			if (Util.calculateDistance(newlocx, newlocy, newlocz, newlocx, newlocy, geoZ, true, false) < 300)
 			{