From fc918dba652ee807f45e174142669df4e9fc85ba Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 6 Sep 2022 10:23:21 +0000 Subject: [PATCH] Removal of unused isReturningToSpawnPoint. --- .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 7 +------ .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../org/l2jmobius/gameserver/ai/SiegeGuardAI.java | 1 - .../gameserver/model/actor/Attackable.java | 13 ------------- .../gameserver/model/actor/instance/Commander.java | 1 - .../model/actor/instance/FortSiegeGuard.java | 1 - .../gameserver/model/actor/instance/Guard.java | 1 - .../gameserver/model/actor/instance/SiegeGuard.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 7 +------ .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../org/l2jmobius/gameserver/ai/SiegeGuardAI.java | 1 - .../gameserver/model/actor/Attackable.java | 13 ------------- .../gameserver/model/actor/instance/Commander.java | 1 - .../model/actor/instance/FortSiegeGuard.java | 1 - .../gameserver/model/actor/instance/Guard.java | 1 - .../gameserver/model/actor/instance/SiegeGuard.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 4 ---- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 4 ---- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 4 ---- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - .../org/l2jmobius/gameserver/ai/AttackableAI.java | 6 +----- .../org/l2jmobius/gameserver/ai/CreatureAI.java | 5 ----- .../gameserver/model/actor/Attackable.java | 12 ------------ .../gameserver/model/actor/instance/Defender.java | 1 - .../model/actor/instance/FortCommander.java | 1 - 150 files changed, 29 insertions(+), 702 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 075a8a7756..3f3f308c99 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -87,7 +87,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -152,16 +151,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1749,7 +1738,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0ebd51cdc7..6922831a4e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -86,7 +86,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -148,16 +147,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1695,7 +1684,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0ebd51cdc7..6922831a4e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -86,7 +86,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -148,16 +147,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1695,7 +1684,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0ebd51cdc7..6922831a4e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -86,7 +86,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -148,16 +147,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1695,7 +1684,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 91d934ca08..4b0edb8c9e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -85,7 +85,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -147,16 +146,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1683,7 +1672,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 91d934ca08..4b0edb8c9e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -85,7 +85,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -147,16 +146,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1683,7 +1672,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 91d934ca08..4b0edb8c9e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -85,7 +85,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -147,16 +146,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1683,7 +1672,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 758a3e68c9..0aa18ff152 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -85,7 +85,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -147,16 +146,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1694,7 +1683,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 758a3e68c9..0aa18ff152 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -85,7 +85,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -147,16 +146,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1694,7 +1683,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 758a3e68c9..0aa18ff152 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -85,7 +85,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -147,16 +146,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1694,7 +1683,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index d62430f101..6eccfeeac8 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -85,7 +85,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -147,16 +146,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1694,7 +1683,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 2132be8c46..c152a0d795 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -566,15 +566,10 @@ public class AttackableAI extends CreatureAI final double distance2 = _actor.calculateDistanceSq2D(x1, y1, z1); if (distance2 > (Config.MAX_DRIFT_RANGE * Config.MAX_DRIFT_RANGE)) { - npc.setReturningToSpawnPoint(true); final double delay = Math.sqrt(distance2) / Config.MAX_DRIFT_RANGE; x1 = _actor.getX() + (int) ((x1 - _actor.getX()) / delay); y1 = _actor.getY() + (int) ((y1 - _actor.getY()) / delay); } - else - { - npc.setReturningToSpawnPoint(false); - } } else { @@ -609,7 +604,7 @@ public class AttackableAI extends CreatureAI if (Config.AGGRO_DISTANCE_CHECK_ENABLED && _actor.isMonster() && !(_actor instanceof NpcWalker) && !(_actor instanceof GrandBoss)) { final Spawn spawn = ((Npc) _actor).getSpawn(); - if ((spawn != null) && !_actor.isInsideRadius3D(spawn.getX(), spawn.getY(), spawn.getZ(), (_actor.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))) + if ((spawn != null) && !_actor.isInsideRadius2D(spawn.getX(), spawn.getY(), spawn.getZ(), (_actor.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))) { if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !_actor.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || (_actor.getInstanceId() == 0))) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 789e5155a9..b6fbae25ef 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -742,10 +741,6 @@ public class CreatureAI extends AbstractAI return; } - if (_actor.isNpc() && _actor.isAttackable()) - { - ((Attackable) _actor).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index 6f488ceae6..e4b84ec3c4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -160,7 +160,6 @@ public class SiegeGuardAI extends CreatureAI implements Runnable public void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1) { CtrlIntention intention = newIntention; - ((Attackable) _actor).setReturningToSpawnPoint(false); if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present { // Check if actor is not dead diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0b1f29d22f..94f2ce22dc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -251,18 +251,6 @@ public class Attackable extends Npc return _aggroList; } - private boolean _isReturningToSpawnPoint = false; - - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - private boolean _canReturnToSpawnPoint = true; public boolean canReturnToSpawnPoint() @@ -2695,7 +2683,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(getSpawn().getX(), getSpawn().getY(), getSpawn().getZ())); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Commander.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Commander.java index 47b88197a4..e4ef93850c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Commander.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Commander.java @@ -115,7 +115,6 @@ public class Commander extends Attackable { if (!isInsideRadius2D(_homeX, _homeY, _homeZ, 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuard.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuard.java index 1fd09eec34..ce1a386b0c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuard.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuard.java @@ -110,7 +110,6 @@ public class FortSiegeGuard extends Attackable if (!isInsideRadius2D(getSpawn().getX(), getSpawn().getY(), getSpawn().getZ(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Guard.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Guard.java index 356dbc1c43..dd16e458df 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Guard.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Guard.java @@ -124,7 +124,6 @@ public class Guard extends Attackable if (!isInsideRadius2D(_homeX, _homeY, _homeZ, 150)) { clearAggroList(); - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_homeX, _homeY, _homeZ, 0)); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuard.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuard.java index 4d0cb8207a..d026233c08 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuard.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuard.java @@ -114,7 +114,6 @@ public class SiegeGuard extends Attackable { if (!isInsideRadius2D(_homeX, _homeY, _homeZ, 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 2132be8c46..c152a0d795 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -566,15 +566,10 @@ public class AttackableAI extends CreatureAI final double distance2 = _actor.calculateDistanceSq2D(x1, y1, z1); if (distance2 > (Config.MAX_DRIFT_RANGE * Config.MAX_DRIFT_RANGE)) { - npc.setReturningToSpawnPoint(true); final double delay = Math.sqrt(distance2) / Config.MAX_DRIFT_RANGE; x1 = _actor.getX() + (int) ((x1 - _actor.getX()) / delay); y1 = _actor.getY() + (int) ((y1 - _actor.getY()) / delay); } - else - { - npc.setReturningToSpawnPoint(false); - } } else { @@ -609,7 +604,7 @@ public class AttackableAI extends CreatureAI if (Config.AGGRO_DISTANCE_CHECK_ENABLED && _actor.isMonster() && !(_actor instanceof NpcWalker) && !(_actor instanceof GrandBoss)) { final Spawn spawn = ((Npc) _actor).getSpawn(); - if ((spawn != null) && !_actor.isInsideRadius3D(spawn.getX(), spawn.getY(), spawn.getZ(), (_actor.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))) + if ((spawn != null) && !_actor.isInsideRadius2D(spawn.getX(), spawn.getY(), spawn.getZ(), (_actor.isRaid() ? Config.AGGRO_DISTANCE_CHECK_RAID_RANGE : Config.AGGRO_DISTANCE_CHECK_RANGE))) { if ((Config.AGGRO_DISTANCE_CHECK_RAIDS || !_actor.isRaid()) && (Config.AGGRO_DISTANCE_CHECK_INSTANCES || (_actor.getInstanceId() == 0))) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 789e5155a9..b6fbae25ef 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -742,10 +741,6 @@ public class CreatureAI extends AbstractAI return; } - if (_actor.isNpc() && _actor.isAttackable()) - { - ((Attackable) _actor).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index 6f488ceae6..e4b84ec3c4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -160,7 +160,6 @@ public class SiegeGuardAI extends CreatureAI implements Runnable public void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1) { CtrlIntention intention = newIntention; - ((Attackable) _actor).setReturningToSpawnPoint(false); if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present { // Check if actor is not dead diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 3217647e4d..1e3b18e716 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -252,18 +252,6 @@ public class Attackable extends Npc return _aggroList; } - private boolean _isReturningToSpawnPoint = false; - - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - private boolean _canReturnToSpawnPoint = true; public boolean canReturnToSpawnPoint() @@ -3047,7 +3035,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(getSpawn().getX(), getSpawn().getY(), getSpawn().getZ())); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Commander.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Commander.java index 47b88197a4..e4ef93850c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Commander.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Commander.java @@ -115,7 +115,6 @@ public class Commander extends Attackable { if (!isInsideRadius2D(_homeX, _homeY, _homeZ, 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuard.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuard.java index 1fd09eec34..ce1a386b0c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuard.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortSiegeGuard.java @@ -110,7 +110,6 @@ public class FortSiegeGuard extends Attackable if (!isInsideRadius2D(getSpawn().getX(), getSpawn().getY(), getSpawn().getZ(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Guard.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Guard.java index 356dbc1c43..dd16e458df 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Guard.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Guard.java @@ -124,7 +124,6 @@ public class Guard extends Attackable if (!isInsideRadius2D(_homeX, _homeY, _homeZ, 150)) { clearAggroList(); - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_homeX, _homeY, _homeZ, 0)); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuard.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuard.java index 4d0cb8207a..d026233c08 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuard.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeGuard.java @@ -114,7 +114,6 @@ public class SiegeGuard extends Attackable { if (!isInsideRadius2D(_homeX, _homeY, _homeZ, 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 5eaa73adbe..ea5f1a244c 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -691,11 +691,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 9f481fefda..273b661c8e 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -685,10 +685,6 @@ public class CreatureAI extends AbstractAI return; } - if (_actor.isAttackable()) - { - ((Attackable) _actor).setReturningToSpawnPoint(false); - } clientStoppedMoving(); if (_actor.isNpc()) diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index d85510e8ea..3ae3b9cf0c 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -81,7 +81,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -142,16 +141,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1691,7 +1680,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index c06b8f0702..510cfecd3b 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -106,7 +106,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 5eaa73adbe..ea5f1a244c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -691,11 +691,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 599d69f6d3..c2097d8213 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -687,10 +687,6 @@ public class CreatureAI extends AbstractAI return; } - if (_actor.isAttackable()) - { - ((Attackable) _actor).setReturningToSpawnPoint(false); - } clientStoppedMoving(); if (_actor.isNpc()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 94ed2374b0..9fefa8ed09 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -82,7 +82,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -143,16 +142,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1692,7 +1681,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index cce029c367..a147550126 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -115,7 +115,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 3f1e1740b4..73bd9949e4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -104,7 +104,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 5eaa73adbe..ea5f1a244c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -691,11 +691,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 599d69f6d3..c2097d8213 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -687,10 +687,6 @@ public class CreatureAI extends AbstractAI return; } - if (_actor.isAttackable()) - { - ((Attackable) _actor).setReturningToSpawnPoint(false); - } clientStoppedMoving(); if (_actor.isNpc()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 94ed2374b0..9fefa8ed09 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -82,7 +82,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -143,16 +142,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1692,7 +1681,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index cce029c367..a147550126 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -115,7 +115,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 3f1e1740b4..73bd9949e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -104,7 +104,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 1145cf068f..33dc4e55a8 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 24f85e7104..e8bdd01051 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -85,7 +85,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -147,16 +146,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1673,7 +1662,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 942ea2f193..69c1d030ea 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -86,7 +86,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -148,16 +147,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1687,7 +1676,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 942ea2f193..69c1d030ea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -86,7 +86,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -148,16 +147,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1687,7 +1676,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 942ea2f193..69c1d030ea 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -86,7 +86,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -148,16 +147,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1687,7 +1676,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9cc225d5c2..9250e5a750 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -86,7 +86,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -148,16 +147,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1687,7 +1676,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5741947175..2028a52bb1 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -88,7 +88,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -150,16 +149,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1707,7 +1696,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5741947175..2028a52bb1 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -88,7 +88,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -150,16 +149,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1707,7 +1696,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5741947175..2028a52bb1 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -88,7 +88,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -150,16 +149,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1707,7 +1696,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5741947175..2028a52bb1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -88,7 +88,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -150,16 +149,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1707,7 +1696,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index dcd8485a88..f3b4a9e869 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 3c5acd1ec1..1a0717558a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -87,7 +87,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -152,16 +151,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1741,7 +1730,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a33a769954..725a2bc65a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -89,7 +89,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -151,16 +150,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1720,7 +1709,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4ac4172f62..2d0597bb06 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -89,7 +89,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -151,16 +150,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1720,7 +1709,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 24d0629f50..2ea6e0d7d6 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -571,11 +571,7 @@ public class AttackableAI extends CreatureAI int x1 = npc.getSpawn().getX(); int y1 = npc.getSpawn().getY(); int z1 = npc.getSpawn().getZ(); - if (!npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) - { - npc.setReturningToSpawnPoint(true); - } - else + if (npc.isInsideRadius2D(x1, y1, 0, Config.MAX_DRIFT_RANGE)) { final int deltaX = Rnd.get(Config.MAX_DRIFT_RANGE * 2); // x int deltaY = Rnd.get(deltaX, Config.MAX_DRIFT_RANGE * 2); // distance diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 708e5586a8..477eec97f6 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -684,10 +683,6 @@ public class CreatureAI extends AbstractAI return; } - if (getActor().isAttackable()) - { - ((Attackable) getActor()).setReturningToSpawnPoint(false); - } clientStoppedMoving(); // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 8e15f8951d..ad211967e8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -90,7 +90,6 @@ public class Attackable extends Npc // private boolean _champion = false; private final Map _aggroList = new ConcurrentHashMap<>(); - private boolean _isReturningToSpawnPoint = false; private boolean _canReturnToSpawnPoint = true; private boolean _seeThroughSilentMove = false; // Manor @@ -152,16 +151,6 @@ public class Attackable extends Npc return _aggroList; } - public boolean isReturningToSpawnPoint() - { - return _isReturningToSpawnPoint; - } - - public void setReturningToSpawnPoint(boolean value) - { - _isReturningToSpawnPoint = value; - } - public boolean canReturnToSpawnPoint() { return _canReturnToSpawnPoint; @@ -1727,7 +1716,6 @@ public class Attackable extends Npc if (hasAI() && (getSpawn() != null)) { - setReturningToSpawnPoint(true); getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation()); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 9c4a41b259..a80e0d4165 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -100,7 +100,6 @@ public class Defender extends Attackable } if (!isInsideRadius2D(getSpawn(), 40)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index ab3de7b8cf..77c16245b1 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -96,7 +96,6 @@ public class FortCommander extends Defender { if (!isInsideRadius2D(getSpawn(), 200)) { - setReturningToSpawnPoint(true); clearAggroList(); if (hasAI())