Fixed climbing walls and stuck inside water.

Contributed by Sahar.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3397,7 +3397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3397,7 +3397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3397,7 +3397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -5530,7 +5530,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -5576,7 +5576,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -4339,7 +4339,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -4341,7 +4341,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/zones/water.xml

@@ -849,6 +849,10 @@
 		<node X="43136" Y="169984" />
 		<node X="44608" Y="170624" />
 	</zone>
+	<zone name="21_24_water1" type="WaterZone" shape="Cuboid" minZ="-4779" maxZ="-3779">
+		<node X="32768" Y="196608" />
+		<node X="65536" Y="229376" />
+	</zone>
 	<zone name="21_25_water1" type="WaterZone" shape="Cuboid" minZ="-4780" maxZ="-3780">
 		<node X="32768" Y="229379" />
 		<node X="65536" Y="262147" />

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/zones/water.xml

@@ -849,6 +849,10 @@
 		<node X="43136" Y="169984" />
 		<node X="44608" Y="170624" />
 	</zone>
+	<zone name="21_24_water1" type="WaterZone" shape="Cuboid" minZ="-4779" maxZ="-3779">
+		<node X="32768" Y="196608" />
+		<node X="65536" Y="229376" />
+	</zone>
 	<zone name="21_25_water1" type="WaterZone" shape="Cuboid" minZ="-4780" maxZ="-3780">
 		<node X="32768" Y="229379" />
 		<node X="65536" Y="262147" />

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/zones/water.xml

@@ -849,6 +849,10 @@
 		<node X="43136" Y="169984" />
 		<node X="44608" Y="170624" />
 	</zone>
+	<zone name="21_24_water1" type="WaterZone" shape="Cuboid" minZ="-4779" maxZ="-3779">
+		<node X="32768" Y="196608" />
+		<node X="65536" Y="229376" />
+	</zone>
 	<zone name="21_25_water1" type="WaterZone" shape="Cuboid" minZ="-4780" maxZ="-3780">
 		<node X="32768" Y="229379" />
 		<node X="65536" Y="262147" />

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3411,7 +3411,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/zones/water.xml

@@ -849,6 +849,10 @@
 		<node X="43136" Y="169984" />
 		<node X="44608" Y="170624" />
 	</zone>
+	<zone name="21_24_water1" type="WaterZone" shape="Cuboid" minZ="-4779" maxZ="-3779">
+		<node X="32768" Y="196608" />
+		<node X="65536" Y="229376" />
+	</zone>
 	<zone name="21_25_water1" type="WaterZone" shape="Cuboid" minZ="-4780" maxZ="-3780">
 		<node X="32768" Y="229379" />
 		<node X="65536" Y="262147" />

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3411,7 +3411,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/zones/water.xml

@@ -849,6 +849,10 @@
 		<node X="43136" Y="169984" />
 		<node X="44608" Y="170624" />
 	</zone>
+	<zone name="21_24_water1" type="WaterZone" shape="Cuboid" minZ="-4779" maxZ="-3779">
+		<node X="32768" Y="196608" />
+		<node X="65536" Y="229376" />
+	</zone>
 	<zone name="21_25_water1" type="WaterZone" shape="Cuboid" minZ="-4780" maxZ="-3780">
 		<node X="32768" Y="229379" />
 		<node X="65536" Y="262147" />

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3410,7 +3410,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_Classic_Interlude/dist/game/data/zones/water.xml

@@ -849,6 +849,10 @@
 		<node X="43136" Y="169984" />
 		<node X="44608" Y="170624" />
 	</zone>
+	<zone name="21_24_water1" type="WaterZone" shape="Cuboid" minZ="-4779" maxZ="-3779">
+		<node X="32768" Y="196608" />
+		<node X="65536" Y="229376" />
+	</zone>
 	<zone name="21_25_water1" type="WaterZone" shape="Cuboid" minZ="-4780" maxZ="-3780">
 		<node X="32768" Y="229379" />
 		<node X="65536" Y="262147" />

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3398,7 +3398,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/zones/water.xml

@@ -849,6 +849,10 @@
 		<node X="43136" Y="169984" />
 		<node X="44608" Y="170624" />
 	</zone>
+	<zone name="21_24_water1" type="WaterZone" shape="Cuboid" minZ="-4779" maxZ="-3779">
+		<node X="32768" Y="196608" />
+		<node X="65536" Y="229376" />
+	</zone>
 	<zone name="21_25_water1" type="WaterZone" shape="Cuboid" minZ="-4780" maxZ="-3780">
 		<node X="32768" Y="229379" />
 		<node X="65536" Y="262147" />

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3413,7 +3413,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }

L2J_Mobius_Essence_5.0_Sylph/dist/game/data/zones/water.xml

@@ -849,6 +849,10 @@
 		<node X="43136" Y="169984" />
 		<node X="44608" Y="170624" />
 	</zone>
+	<zone name="21_24_water1" type="WaterZone" shape="Cuboid" minZ="-4779" maxZ="-3779">
+		<node X="32768" Y="196608" />
+		<node X="65536" Y="229376" />
+	</zone>
 	<zone name="21_25_water1" type="WaterZone" shape="Cuboid" minZ="-4780" maxZ="-3780">
 		<node X="32768" Y="229379" />
 		<node X="65536" Y="262147" />

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3420,7 +3420,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceWorld());
 					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
 					{
-						// if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
+						if (isPlayer() && !_isFlying && !isInWater)
+						{
+							return;
+						}
+						// if (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140))
+						// {
+						// return;
+						// }
+						// if (isSummon() && !((Summon) this).getFollowStatus())
 						// {
 						// return;
 						// }