From dce5c98285ad39ea18532adb3baeb9691d9728c9 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 6 Mar 2021 10:18:20 +0000 Subject: [PATCH] Fixed climbing walls and stuck inside water. Contributed by Sahar. --- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../dist/game/data/zones/water.xml | 4 ++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../dist/game/data/zones/water.xml | 4 ++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../dist/game/data/zones/water.xml | 4 ++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../dist/game/data/zones/water.xml | 4 ++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../dist/game/data/zones/water.xml | 4 ++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../dist/game/data/zones/water.xml | 4 ++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../dist/game/data/zones/water.xml | 4 ++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- .../dist/game/data/zones/water.xml | 4 ++++ .../org/l2jmobius/gameserver/model/actor/Creature.java | 10 +++++++++- 31 files changed, 239 insertions(+), 23 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index 903b8a7c5f..efb7cd3022 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index 903b8a7c5f..efb7cd3022 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index 207a24d2f8..7e13d55f37 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index 207a24d2f8..7e13d55f37 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1acba90425..33f5905868 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1acba90425..33f5905868 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1acba90425..33f5905868 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 436a2dd5cc..39b5882076 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java index 436a2dd5cc..39b5882076 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java index 436a2dd5cc..39b5882076 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1ca16730c6..c5f5dbab1c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 896df20772..78df878764 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java index 9033cd775f..65dce90936 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java index d77136c104..0a80a1243e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8cbf8561b0..98e36b6d20 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/zones/water.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/zones/water.xml index 0141d45ed6..68565c9c45 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/zones/water.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/zones/water.xml @@ -849,6 +849,10 @@ + + + + diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8cbf8561b0..98e36b6d20 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/zones/water.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/zones/water.xml index 22e5f653ae..a1b67196ac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/zones/water.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/zones/water.xml @@ -849,6 +849,10 @@ + + + + diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index b28366d11c..8642138cf6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/zones/water.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/zones/water.xml index 22e5f653ae..a1b67196ac 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/zones/water.xml +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/zones/water.xml @@ -849,6 +849,10 @@ + + + + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index 856ecf02dc..bdd62715c4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/zones/water.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/zones/water.xml index 22e5f653ae..a1b67196ac 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/zones/water.xml +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/zones/water.xml @@ -849,6 +849,10 @@ + + + + diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index 856ecf02dc..bdd62715c4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/zones/water.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/zones/water.xml index 22e5f653ae..a1b67196ac 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/zones/water.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/zones/water.xml @@ -849,6 +849,10 @@ + + + + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index 0046bf4493..e6ae614811 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/zones/water.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/zones/water.xml index 0141d45ed6..68565c9c45 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/zones/water.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/zones/water.xml @@ -849,6 +849,10 @@ + + + + diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8cbf8561b0..98e36b6d20 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/zones/water.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/zones/water.xml index 22e5f653ae..a1b67196ac 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/zones/water.xml +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/zones/water.xml @@ -849,6 +849,10 @@ + + + + diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java index a20c4acbb7..817f077a0d 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // } diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/zones/water.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/zones/water.xml index ac68e30359..92c31b8947 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/zones/water.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/zones/water.xml @@ -849,6 +849,10 @@ + + + + diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java index 9423aaf526..6d863b2711 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/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; // }