diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 29e558e199..84ea70390e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -476,7 +476,7 @@ abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _accessor.moveTo(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _accessor.moveTo(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); // Mobius: Solves moving to wrong Z when not using geodata, // but probably is not accurate and you should use geodata. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 29e558e199..84ea70390e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -476,7 +476,7 @@ abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _accessor.moveTo(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _accessor.moveTo(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); // Mobius: Solves moving to wrong Z when not using geodata, // but probably is not accurate and you should use geodata. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 42f7c77265..ca993dd1d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -530,7 +530,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 42f7c77265..ca993dd1d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -530,7 +530,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 03447b876b..2abf57dbc2 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -467,7 +467,7 @@ public abstract class AbstractAI implements Ctrl } // Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController - _actor.moveToLocation(pawn, pawn.getX(), pawn.getY(), pawn.getZ(), offset); + _actor.moveToLocation(_actor.isPlayable() ? pawn : null, pawn.getX(), pawn.getY(), pawn.getZ(), offset); if (!_actor.isMoving()) {