diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java index 22edf5dc0b..14b0ae497c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java @@ -175,7 +175,7 @@ public final class Apherus extends AbstractNpcAI for (int i = 0; i < 4; i++) { final L2MonsterInstance protector = (L2MonsterInstance) addSpawn(APHERUS_DOOR_GUARD[getRandom(APHERUS_DOOR_GUARD.length)], player.getX() + getRandom(10, 30), player.getY() + getRandom(10, 30), player.getZ(), 0, false, 600000, false); - protector.setIsRunning(true); + protector.setRunning(); protector.setTarget(player); addAttackPlayerDesire(protector, player); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java index 97a51dab77..cba2edd6c4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java @@ -147,7 +147,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI { if ((monster.getId() == TANTA_MAGICIAN) || (monster.getId() == TANTA_SCOUT)) { - monster.setIsRunning(true); + monster.setRunning(); monster.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(npc.getX(), npc.getY(), npc.getZ(), 0)); } }); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 1ccd0b2a99..ae1f51b6b6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -143,7 +143,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -157,7 +157,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -168,7 +168,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -298,7 +298,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.setTarget(creature); npc.doCast(CREW_SKILL.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature); } return super.onSeeCreature(npc, creature, isSummon); @@ -424,7 +424,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.getVariables().set("SELFBUFF_USED", 1); npc.doCast(selfRangeBuff1.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java index 83fb8bb628..6fb7ee6231 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java @@ -94,7 +94,7 @@ public final class Maguen extends AbstractNpcAI final L2Npc maguen = addSpawn(MAGUEN, npc.getLocation(), true, 60000, true); maguen.getVariables().set("SUMMON_PLAYER", player); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java index 0659f059e8..f24f3fe291 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java @@ -85,7 +85,7 @@ public final class Nemo extends AbstractNpcAI maguen.getVariables().set("TEST_MAGUEN", 1); player.getVariables().set("TEST_MAGUEN", 1); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java index 30b0a619c6..20ea7f0c04 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java @@ -246,7 +246,7 @@ public final class SelMahumDrill extends AbstractNpcAI } receiver.disableCoreAI(true); receiver.getVariables().set("BUSY_STATE", 1); - receiver.setIsRunning(true); + receiver.setRunning(); receiver.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location((receiver.getX() + getRandom(-800, 800)), (receiver.getY() + getRandom(-800, 800)), receiver.getZ(), receiver.getHeading())); startQuestTimer("reset_busy_state", 5000, receiver, null); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java index f221a3c2fa..a489ec3d2b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java @@ -139,7 +139,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "fire_arrived": { // myself.i_quest0 = 1; - npc.setIsRunning(false); + npc.setWalking(); npc.setTarget(npc); if (!npc.isRandomWalkingEnabled()) @@ -172,7 +172,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "remove_effects": { // myself.i_quest0 = 0; - npc.setIsRunning(true); + npc.setRunning(); npc.setDisplayEffect(MAHUM_EFFECT_NONE); break; } @@ -244,7 +244,7 @@ public final class SelMahumSquad extends AbstractNpcAI if (receiver.isRandomWalkingEnabled() && !receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && CommonUtil.contains(SQUAD_LEADERS, receiver.getId())) { receiver.setRandomWalking(false); // Moving to fire - i_ai0 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); receiver.stopMove(null); @@ -279,7 +279,7 @@ public final class SelMahumSquad extends AbstractNpcAI } receiver.setRandomWalking(false); // Moving to fire - i_ai0 = 1 receiver.getVariables().set("BUSY_STATE", 1); // Eating - i_ai3 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); receiver.broadcastSay(ChatType.NPC_GENERAL, (getRandom(3) < 1) ? NpcStringId.LOOKS_DELICIOUS : NpcStringId.LET_S_GO_EAT); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); @@ -386,7 +386,7 @@ public final class SelMahumSquad extends AbstractNpcAI cancelQuestTimer("chef_set_invul", npc, null); npc.getVariables().remove("BUSY_STATE"); npc.getVariables().remove("INVUL_REMOVE_TIMER_STARTED"); - npc.setIsRunning(false); + npc.setWalking(); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java index f9a9f5b946..aca7158334 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java @@ -74,7 +74,7 @@ public final class BoyAndGirl extends AbstractNpcAI { startQuestTimer("NPC_CHANGEWEAP", 15000 + (getRandom(5) * 1000), npc, null); startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null); - npc.setIsRunning(true); + npc.setRunning(); final Location randomLoc = Util.getRandomPosition(npc.getSpawn().getLocation(), 200, 600); addMoveToDesire(npc, GeoEngine.getInstance().canMoveToTargetLoc(npc.getLocation().getX(), npc.getLocation().getY(), npc.getLocation().getZ(), randomLoc.getX(), randomLoc.getY(), randomLoc.getZ(), npc.getInstanceWorld()), 23); return super.onSpawn(npc); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Anais/Anais.java index ff5cbd1f36..c7f891b037 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Anais/Anais.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Anais/Anais.java @@ -58,7 +58,7 @@ public final class Anais extends AbstractNpcAI { final L2Npc npc = _divineBurners.get(pot); npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); if (pot < 4) { _current = npc; @@ -92,10 +92,10 @@ public final class Anais extends AbstractNpcAI final L2Npc b = _divineBurners.get(_pot); _pot = _pot + 1; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); final L2Npc ward = addSpawn(GRAIL_WARD, new Location(b.getX(), b.getY(), b.getZ()), true, 0); ((L2Attackable) ward).addDamageHate(_nextTarget, 0, 999); - ward.setIsRunning(true); + ward.setRunning(); ward.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _nextTarget, null); startQuestTimer("GUARD_ATTACK", 1000, ward, _nextTarget, true); startQuestTimer("SUICIDE", 20000, ward, null); @@ -127,7 +127,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } npc.doDie(null); @@ -175,7 +175,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a70e0d4d26..cca025f7bd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -358,7 +358,7 @@ public final class Baium extends AbstractNpcAI { mob.clearAggroList(); } - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(_baium, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _baium); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index bb3269b53a..51b3c7f53a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -153,7 +153,7 @@ public final class BalokWarzone extends AbstractInstance L2Npc minion = minionList.get(Rnd.get(minionList.size())); if (minion != null) { - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setCanReturnToSpawnPoint(false); currentMinion = minion; getTimers().addTimer("stage_last_minion_walk", 2000, minion, player); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java index 6d4860e00b..77d7907440 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java @@ -75,7 +75,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((mob.getId() == ARCHERY_KNIGHT) && !mob.isDead() && !mob.isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob); ((L2Attackable) npc).addDamageHate(mob, 0, 999999); } @@ -151,7 +151,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((mob.getId() == ARCHERY_KNIGHT) && !mob.isDead() && !mob.isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob); ((L2Attackable) npc).addDamageHate(mob, 0, 999999); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 92b19efcf5..351d4b0ea5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -382,7 +382,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (npc.getVariables().getInt("FREYA_MOVE") == 0) { controller.getVariables().set("FREYA_MOVE", 1); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } break; @@ -431,14 +431,14 @@ public final class IceQueensCastleBattle extends AbstractInstance manageScreenMsg(world, NpcStringId.BEGIN_STAGE_4); final FriendlyNpcInstance jinia = (FriendlyNpcInstance) addSpawn(SUPP_JINIA, SUPP_JINIA_SPAWN, false, 0, true, world.getId()); - jinia.setIsRunning(true); + jinia.setRunning(); jinia.setIsInvul(true); jinia.setCanReturnToSpawnPoint(false); jinia.reduceCurrentHp(1, freya, null); // TODO: Find better way for attack freya.reduceCurrentHp(1, jinia, null); final FriendlyNpcInstance kegor = (FriendlyNpcInstance) addSpawn(SUPP_KEGOR, SUPP_KEGOR_SPAWN, false, 0, true, world.getId()); - kegor.setIsRunning(true); + kegor.setRunning(); kegor.setIsInvul(true); kegor.setCanReturnToSpawnPoint(false); kegor.reduceCurrentHp(1, freya, null); // TODO: Find better way for attack @@ -673,7 +673,7 @@ public final class IceQueensCastleBattle extends AbstractInstance for (int i = 0; i < 3; i++) { final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), true, 0, false, world.getId()); - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(mob.getMostHated(), 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob.getMostHated()); startQuestTimer("BLIZZARD", 20000, breath, null); @@ -751,7 +751,7 @@ public final class IceQueensCastleBattle extends AbstractInstance { controller.getVariables().set("FREYA_MOVE", 1); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -825,7 +825,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (controller.getVariables().getInt("FREYA_MOVE") == 0) { controller.getVariables().set("FREYA_MOVE", 1); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1042,7 +1042,7 @@ public final class IceQueensCastleBattle extends AbstractInstance final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), false, 0, false, world.getId()); if (player != null) { - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(player, 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } @@ -1116,7 +1116,7 @@ public final class IceQueensCastleBattle extends AbstractInstance manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); final L2Npc freya = params.getObject("freya", L2Npc.class); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1173,7 +1173,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (target != null) { ((L2Attackable) mob).addDamageHate(target, 0, 999); - mob.setIsRunning(true); + mob.setRunning(); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } else diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 51ee3bad82..ff290b7fab 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -103,7 +103,7 @@ public final class KimerianCommon extends AbstractInstance } else if (!npc.isAttackingNow() && (distance > 250)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23); } else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) @@ -270,7 +270,7 @@ public final class KimerianCommon extends AbstractInstance getTimers().addTimer("KIMERIAN_CHAT_1", 5000, t -> kimerian.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_COME_BACK_ALIVE_WITH_ROTTING_AURA)); getTimers().addTimer("KIMERIAN_RUN", 6000, t -> { - kimerian.setIsRunning(true); + kimerian.setRunning(); addMoveToDesire(kimerian, loc, 23); kimerian.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HA_HA_HA_HA); }); @@ -309,7 +309,7 @@ public final class KimerianCommon extends AbstractInstance case NEOMI_KASHERON: { npc.initSeenCreatures(); - npc.setIsRunning(true); + npc.setRunning(); break; } case INVISIBLE_NPC: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java index d9bf024d24..91c2ed7533 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java @@ -140,14 +140,14 @@ public class Vortex extends AbstractNpcAI { attackRandomTarget(npc); npc.setRandomWalking(true); - npc.setIsRunning(true); + npc.setRunning(); break; } case BIG_VORTEX: { attackRandomTarget(npc); npc.setRandomWalking(true); - npc.setIsRunning(true); + npc.setRunning(); break; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index c6f024c42c..94a080c937 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -187,7 +187,7 @@ public final class OctavisWarzone extends AbstractInstance ((L2Attackable) beasts).setCanReturnToSpawnPoint(false); final L2Npc octavis = addSpawn((!isExtremeMode(world) ? OCTAVIS_STAGE_1[0] : OCTAVIS_STAGE_1[1]), OCTAVIS_SPAWN_LOC, false, 0, false, world.getId()); octavis.disableCoreAI(true); - octavis.setIsRunning(true); + octavis.setRunning(); octavis.sendChannelingEffect(beasts, 1); octavis.setTargetable(false); ((L2Attackable) octavis).setCanReturnToSpawnPoint(false); @@ -286,7 +286,7 @@ public final class OctavisWarzone extends AbstractInstance if ((moveX != 0) && (moveY != 0)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, new Location(moveX, moveY, -10008), 23); } break; @@ -299,7 +299,7 @@ public final class OctavisWarzone extends AbstractInstance for (int i = 0; i < count; i++) { final L2Npc beast = addSpawn((!isExtremeMode(world) ? BEASTS_MINIONS[0] : BEASTS_MINIONS[1]), loc, false, 0, false, world.getId()); - beast.setIsRunning(true); + beast.setRunning(); ((L2Attackable) beast).setCanReturnToSpawnPoint(false); addMoveToDesire(beast, Util.getRandomPosition(BEASTS_RANDOM_POINT, 500, 500), 23); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Minigame/Minigame.java index 0c5846b39c..3fbeed5ae7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Minigame/Minigame.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Minigame/Minigame.java @@ -110,14 +110,14 @@ public final class Minigame extends AbstractNpcAI if (npc.getId() == BURNER) { npc.setDisplayEffect(2); - npc.setIsRunning(false); + npc.setWalking(); } else { for (L2Npc burner : room.getBurners()) { burner.setDisplayEffect(2); - burner.setIsRunning(false); + burner.setWalking(); } } break; @@ -145,7 +145,7 @@ public final class Minigame extends AbstractNpcAI { final L2Npc b = room.getBurners()[room.getOrder()[room.getCurrentPot()]]; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); startQuestTimer("off", 2000, b, null); // Stopping burning each pot 2s after startQuestTimer("timer", TIMER_INTERVAL * 1000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); @@ -276,7 +276,7 @@ public final class Minigame extends AbstractNpcAI if (room.getCurrentPot() < 8) { npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); startQuestTimer("off", 2000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); } @@ -419,7 +419,7 @@ public final class Minigame extends AbstractNpcAI for (L2Npc burner : _burners) { burner.setDisplayEffect(1); - burner.setIsRunning(false); + burner.setWalking(); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 193f623abd..ae4549f39f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -186,7 +186,7 @@ public final class SummonNpc extends AbstractEffect { npc.scheduleDespawn(_despawnDelay); } - npc.setIsRunning(false); // TODO: Fix broadcast info. + npc.setWalking(); // TODO: Fix broadcast info. } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/RunWalk.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/RunWalk.java index 0d5d0d9384..c5fa6aa3f1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/RunWalk.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/RunWalk.java @@ -22,13 +22,20 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; /** * Run/Walk player action handler. - * @author UnAfraid + * @author Mobius */ public final class RunWalk implements IPlayerActionHandler { @Override public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed) { - activeChar.setIsRunning(!activeChar.isRunning()); + if (activeChar.isRunning()) + { + activeChar.setWalking(); + } + else + { + activeChar.setRunning(); + } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 83cd0ac7d3..c0c1bba266 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -226,7 +226,7 @@ public final class ChamberOfProphecies extends AbstractInstance case "ATTACK1": case "ATTACK2": { - npc.setIsRunning(true); + npc.setRunning(); ((L2Attackable) npc).setCanReturnToSpawnPoint(false); ((L2Attackable) npc).setCanStopAttackByTime(false); if (npc.isScriptValue(0) && world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index d499d74b31..fe268f6cd0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -119,7 +119,7 @@ public final class KartiaHelperAdolph extends AbstractNpcAI if (!npc.isInsideRadius(loc, 50, true, true)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index 031dddadc4..374348ece8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -88,7 +88,7 @@ public final class KartiaHelperBarton extends AbstractNpcAI } else { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e58c7fa851..a667ca8510 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -227,7 +227,7 @@ public final class KartiaHelperElise extends AbstractNpcAI } else { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 1c08fce80a..b633afc228 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -284,7 +284,7 @@ public final class KartiasLabyrinth extends AbstractInstance { final Location loc = instance.getTemplateParameters().getLocation("middlePointRoom1"); final Location moveTo = new Location(loc.getX() + getRandom(-100, 100), loc.getY() + getRandom(-100, 100), loc.getZ()); - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, moveTo, 6); getTimers().addTimer("START_MOVE", 15000, npc, null); } @@ -292,7 +292,7 @@ public final class KartiasLabyrinth extends AbstractInstance { final Location loc = instance.getTemplateParameters().getLocation("middlePointRoom3"); final Location moveTo = new Location(loc.getX() + getRandom(-200, 200), loc.getY() + getRandom(-200, 200), loc.getZ()); - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, moveTo, 23); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index ca5fe1d144..4531bd01b2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -445,7 +445,7 @@ public final class LabyrinthOfBelis extends AbstractInstance public String onSpawn(L2Npc npc) { final L2Attackable officer = (L2Attackable) npc; - officer.setIsRunning(true); + officer.setRunning(); officer.setCanReturnToSpawnPoint(false); getTimers().addRepeatingTimer("MESSAGE", 6000, npc, null); return super.onSpawn(npc); @@ -499,7 +499,7 @@ public final class LabyrinthOfBelis extends AbstractInstance showOnScreenMsg(player, (getRandomBoolean() ? NpcStringId.IF_TERAIN_DIES_THE_MISSION_WILL_FAIL : NpcStringId.BEHIND_YOU_THE_ENEMY_IS_AMBUSHING_YOU), ExShowScreenMessage.TOP_CENTER, 4500); final L2Attackable mob = (L2Attackable) addSpawn((getRandomBoolean() ? OPERATIVE : HANDYMAN), SPAWN_ATTACKERS, false, 0, true, world.getId()); - mob.setIsRunning(true); + mob.setRunning(); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, ATTACKER_SPOT); mob.broadcastSay(ChatType.NPC_GENERAL, (getRandomBoolean() ? NpcStringId.KILL_THE_GUY_MESSING_WITH_THE_ELECTRIC_DEVICE : NpcStringId.FOCUS_ON_ATTACKING_THE_GUY_IN_THE_ROOM)); mob.addDamageHate(npc, 0, 9999); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 2f7ac24bd1..6e22603a10 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -283,7 +283,7 @@ public final class MemoryOfDisaster extends AbstractInstance case "AWAKENING_GUIDE": { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, AWAKENING_GUIDE_MOVE_1); - npc.setIsRunning(true); + npc.setRunning(); break; } default: @@ -323,13 +323,13 @@ public final class MemoryOfDisaster extends AbstractInstance } case WIRPHY: { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, WIRPHY_MOVE, 23); break; } case SILVERA: { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, SILVERA_MOVE, 23); break; } @@ -470,7 +470,7 @@ public final class MemoryOfDisaster extends AbstractInstance player.getInstanceWorld().spawnGroup("ROGIN").forEach(n -> { addMoveToDesire(n, ROGIN_MOVE, 23); - n.setIsRunning(true); + n.setRunning(); }); break; } @@ -583,7 +583,7 @@ public final class MemoryOfDisaster extends AbstractInstance { npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { - n.setIsRunning(true); + n.setRunning(); n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); @@ -915,7 +915,7 @@ public final class MemoryOfDisaster extends AbstractInstance { if (skill.getId() == SIEGE_GOLEM_SKILL_1.getSkillId()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().moveTo(GOLEM_MOVE); } break; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java index af8d5a5b97..c1e5238e74 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java @@ -84,7 +84,7 @@ public final class MithrilMine extends AbstractInstance for (L2Npc n : npcs) { n.setScriptValue(1); - n.setIsRunning(true); + n.setRunning(); n.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, npc); ((L2Attackable) n).addDamageHate(npc, 0, 999999); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index e1cf0c7526..1a1f6ed758 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -82,7 +82,7 @@ public final class MuseumDungeon extends AbstractInstance desk.getVariables().set("book", true); // Set Toyron - toyron.setIsRunning(true); + toyron.setRunning(); toyron.setCanReturnToSpawnPoint(false); } @@ -128,7 +128,7 @@ public final class MuseumDungeon extends AbstractInstance final List thiefs = world.spawnGroup("thiefs"); for (L2Npc thief : thiefs) { - thief.setIsRunning(true); + thief.setRunning(); addAttackPlayerDesire(thief, player); thief.broadcastSay(ChatType.NPC_GENERAL, THIEF_SHOUT[getRandom(2)]); } @@ -143,7 +143,7 @@ public final class MuseumDungeon extends AbstractInstance final List thiefs = world.spawnGroup("thiefs"); for (L2Npc thief : thiefs) { - thief.setIsRunning(true); + thief.setRunning(); } break; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java index f2affd49bf..8f3d025600 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -352,7 +352,7 @@ public final class Nursery extends AbstractInstance if (getRandom(100) < 4) { final L2Npc maguen = addSpawn(MAGUEN, npc, false, 0, false, instance.getId()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().startFollow(killer); showOnScreenMsg(instance, NpcStringId.MAGUEN_APPEARANCE, ExShowScreenMessage.MIDDLE_CENTER, 4000); getTimers().addTimer("MAGUEN_WAIT_TIMER", 4000, maguen, killer); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java index 2e91b4c520..5fbcd08676 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java @@ -184,7 +184,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance { npc.disableCoreAI(true); npc.setScriptValue(1); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, LEMATAN_PORT_POINT); } break; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java index edce534b9e..646d5622be 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java @@ -87,7 +87,7 @@ public final class SSQLibraryOfSages extends AbstractInstance } case "FOLLOW": { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); npc.broadcastSay(ChatType.NPC_GENERAL, ELCADIA_DIALOGS[getRandom(ELCADIA_DIALOGS.length)]); startQuestTimer("FOLLOW", 10000, npc, player); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java index fcfb319c56..a6e227675e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java @@ -194,7 +194,7 @@ public final class SSQMonasteryOfSilence extends AbstractInstance { return null; } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); if (player.isInCombat()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index fb2c3e2d4f..48f101724b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -87,7 +87,7 @@ public final class TalkingIslandPast extends AbstractInstance { final L2Npc knight = addSpawn(MYSTERIOUS_DARK_KNIGHT, TI_LOC_3, false, 0, false, instance.getId()); knight.getAI().startFollow(player); - knight.setIsRunning(true); + knight.setRunning(); showOnScreenMsg(player, NpcStringId.A_MYSTERIOUS_DARK_KNIGHT_IS_HERE, ExShowScreenMessage.TOP_CENTER, 5000); getTimers().addTimer("MSG", null, 5000, null, player, n -> showOnScreenMsg(n.getPlayer(), NpcStringId.TALK_TO_THE_MYSTERIOUS_DARK_KNIGHT, ExShowScreenMessage.TOP_CENTER, 5000)); } @@ -129,7 +129,7 @@ public final class TalkingIslandPast extends AbstractInstance qs.setMemoState(2); final L2Npc knight = addSpawn(MYSTERIOUS_DARK_KNIGHT, loc, false, 0, false, instance.getId()); knight.getAI().startFollow(player); - knight.setIsRunning(true); + knight.setRunning(); showOnScreenMsg(player, NpcStringId.A_MYSTERIOUS_DARK_KNIGHT_IS_HERE, ExShowScreenMessage.TOP_CENTER, 5000); getTimers().addTimer("MSG", null, 5000, npc, player, n -> showOnScreenMsg(n.getPlayer(), NpcStringId.TALK_TO_THE_MYSTERIOUS_DARK_KNIGHT, ExShowScreenMessage.TOP_CENTER, 5000)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java index 372f446bc8..fface8a39d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java @@ -153,7 +153,7 @@ public final class Q10326_RespectYourElders extends Quest { npc.getVariables().set("OWNER", player); npc.setTitle(player.getName()); - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, HANDERMONKEY_LOC[0], 0); npc.getVariables().set("MOVE_INDEX", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java index a2c9e77d46..69073a25ef 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java @@ -188,7 +188,7 @@ public final class Q10329_BackupSeekers extends Quest if (qs.isMemoState(1)) { npc.setSummoner(player); - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, BART_LOC_1[0], 0); npc.getVariables().set("MOVE_INDEX", 0); @@ -199,7 +199,7 @@ public final class Q10329_BackupSeekers extends Quest else if (qs.isMemoState(2)) { npc.setSummoner(player); - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, BART_LOC_2[0], 0); npc.getVariables().set("MOVE_INDEX", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java index 61a2a24a9a..3f8a11d4ef 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java @@ -203,7 +203,7 @@ public final class Q10365_SeekerEscort extends Quest { if (qs.isMemoState(1)) { - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, BLOODHOUND_LOC_1[0], 0); npc.getVariables().set("MOVE_INDEX", 0); @@ -211,7 +211,7 @@ public final class Q10365_SeekerEscort extends Quest } else if (qs.isMemoState(2)) { - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, BLOODHOUND_LOC_2[0], 0); npc.getVariables().set("MOVE_INDEX", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index 2c1af2741a..ee08afc59a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -110,7 +110,7 @@ public final class Q10742_AFurryFriend extends Quest final L2Npc ricky = addSpawn(RICKY, player, true, 120000); ricky.setSummoner(player); ricky.setTitle(player.getName()); - ricky.setIsRunning(true); + ricky.setRunning(); ricky.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); startQuestTimer("CHECK_RICKY_DISTANCE", 2500, ricky, player); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 1da1b21546..4fd0b4e8b5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -676,7 +676,10 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable // Set the AI Intention to AI_INTENTION_ACTIVE setIntention(AI_INTENTION_ACTIVE); - npc.setWalking(); + if (!_actor.isFakePlayer()) + { + npc.setWalking(); + } return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index 7eb1fba95c..31b5b6bb8a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -825,7 +825,7 @@ public class L2CharacterAI extends AbstractAI // Kill the actor client side by sending Server->Client packet AutoAttackStop, StopMove/StopRotation, Die (broadcast) clientNotifyDead(); - if (!_actor.isPlayable()) + if (!_actor.isPlayable() && !_actor.isFakePlayer()) { _actor.setWalking(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java index 3da5ea144c..b56e5922f7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java @@ -299,7 +299,14 @@ public final class WalkingManager implements IGameXmlReader } npc.sendDebugMessage("Starting to move at route '" + routeName + "'"); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setWalkCheckTask(ThreadPoolManager.scheduleAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight @@ -332,7 +339,14 @@ public final class WalkingManager implements IGameXmlReader walk.setBlocked(true); final L2NpcWalkerNode node = walk.getCurrentNode(); npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId()); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setBlocked(false); walk.setStoppedByAttack(false); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index dd23f482b8..cb75e3c3b1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -772,7 +772,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } return; } @@ -790,7 +793,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } } @@ -1461,14 +1467,16 @@ public class L2Attackable extends L2Npc setScriptValue(0); // remove pvp flag setRunning(); // don't walk } + else + { + setWalking(); + } // Clear mod Seeded stat _seeded = false; _seed = null; _seederObjId = 0; - setWalking(); - // check the region where this mob is, do not activate the AI if region is inactive. // if (!isInActiveRegion()) // { @@ -1799,7 +1807,10 @@ public class L2Attackable extends L2Npc { ((L2AttackableAI) getAI()).setGlobalAggro(-25); } - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } clearAggroList(); } getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java index b098378730..5e67e56705 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -2307,7 +2307,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return _isRunning; } - public final void setIsRunning(boolean value) + private final void setIsRunning(boolean value) { if (_isRunning == value) { @@ -2355,10 +2355,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance. */ public final void setRunning() { - if (!isRunning()) - { - setIsRunning(true); - } + setIsRunning(true); } public final boolean hasBlockActions() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index d62c0be382..e7e77b497a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -3199,7 +3199,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { ((L2Attackable) npc).addDamageHate(target, 0, desire); } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -3210,7 +3210,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime */ protected void addAttackDesire(L2Npc npc, L2Character target) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java index 22edf5dc0b..14b0ae497c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java @@ -175,7 +175,7 @@ public final class Apherus extends AbstractNpcAI for (int i = 0; i < 4; i++) { final L2MonsterInstance protector = (L2MonsterInstance) addSpawn(APHERUS_DOOR_GUARD[getRandom(APHERUS_DOOR_GUARD.length)], player.getX() + getRandom(10, 30), player.getY() + getRandom(10, 30), player.getZ(), 0, false, 600000, false); - protector.setIsRunning(true); + protector.setRunning(); protector.setTarget(player); addAttackPlayerDesire(protector, player); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java index 97a51dab77..cba2edd6c4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java @@ -147,7 +147,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI { if ((monster.getId() == TANTA_MAGICIAN) || (monster.getId() == TANTA_SCOUT)) { - monster.setIsRunning(true); + monster.setRunning(); monster.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(npc.getX(), npc.getY(), npc.getZ(), 0)); } }); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 1ccd0b2a99..ae1f51b6b6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -143,7 +143,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -157,7 +157,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -168,7 +168,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -298,7 +298,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.setTarget(creature); npc.doCast(CREW_SKILL.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature); } return super.onSeeCreature(npc, creature, isSummon); @@ -424,7 +424,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.getVariables().set("SELFBUFF_USED", 1); npc.doCast(selfRangeBuff1.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java index 83fb8bb628..6fb7ee6231 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java @@ -94,7 +94,7 @@ public final class Maguen extends AbstractNpcAI final L2Npc maguen = addSpawn(MAGUEN, npc.getLocation(), true, 60000, true); maguen.getVariables().set("SUMMON_PLAYER", player); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java index 0659f059e8..f24f3fe291 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java @@ -85,7 +85,7 @@ public final class Nemo extends AbstractNpcAI maguen.getVariables().set("TEST_MAGUEN", 1); player.getVariables().set("TEST_MAGUEN", 1); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java index 30b0a619c6..20ea7f0c04 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java @@ -246,7 +246,7 @@ public final class SelMahumDrill extends AbstractNpcAI } receiver.disableCoreAI(true); receiver.getVariables().set("BUSY_STATE", 1); - receiver.setIsRunning(true); + receiver.setRunning(); receiver.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location((receiver.getX() + getRandom(-800, 800)), (receiver.getY() + getRandom(-800, 800)), receiver.getZ(), receiver.getHeading())); startQuestTimer("reset_busy_state", 5000, receiver, null); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java index f221a3c2fa..a489ec3d2b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java @@ -139,7 +139,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "fire_arrived": { // myself.i_quest0 = 1; - npc.setIsRunning(false); + npc.setWalking(); npc.setTarget(npc); if (!npc.isRandomWalkingEnabled()) @@ -172,7 +172,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "remove_effects": { // myself.i_quest0 = 0; - npc.setIsRunning(true); + npc.setRunning(); npc.setDisplayEffect(MAHUM_EFFECT_NONE); break; } @@ -244,7 +244,7 @@ public final class SelMahumSquad extends AbstractNpcAI if (receiver.isRandomWalkingEnabled() && !receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && CommonUtil.contains(SQUAD_LEADERS, receiver.getId())) { receiver.setRandomWalking(false); // Moving to fire - i_ai0 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); receiver.stopMove(null); @@ -279,7 +279,7 @@ public final class SelMahumSquad extends AbstractNpcAI } receiver.setRandomWalking(false); // Moving to fire - i_ai0 = 1 receiver.getVariables().set("BUSY_STATE", 1); // Eating - i_ai3 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); receiver.broadcastSay(ChatType.NPC_GENERAL, (getRandom(3) < 1) ? NpcStringId.LOOKS_DELICIOUS : NpcStringId.LET_S_GO_EAT); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); @@ -386,7 +386,7 @@ public final class SelMahumSquad extends AbstractNpcAI cancelQuestTimer("chef_set_invul", npc, null); npc.getVariables().remove("BUSY_STATE"); npc.getVariables().remove("INVUL_REMOVE_TIMER_STARTED"); - npc.setIsRunning(false); + npc.setWalking(); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java index f9a9f5b946..aca7158334 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java @@ -74,7 +74,7 @@ public final class BoyAndGirl extends AbstractNpcAI { startQuestTimer("NPC_CHANGEWEAP", 15000 + (getRandom(5) * 1000), npc, null); startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null); - npc.setIsRunning(true); + npc.setRunning(); final Location randomLoc = Util.getRandomPosition(npc.getSpawn().getLocation(), 200, 600); addMoveToDesire(npc, GeoEngine.getInstance().canMoveToTargetLoc(npc.getLocation().getX(), npc.getLocation().getY(), npc.getLocation().getZ(), randomLoc.getX(), randomLoc.getY(), randomLoc.getZ(), npc.getInstanceWorld()), 23); return super.onSpawn(npc); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java index ff5cbd1f36..c7f891b037 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Anais/Anais.java @@ -58,7 +58,7 @@ public final class Anais extends AbstractNpcAI { final L2Npc npc = _divineBurners.get(pot); npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); if (pot < 4) { _current = npc; @@ -92,10 +92,10 @@ public final class Anais extends AbstractNpcAI final L2Npc b = _divineBurners.get(_pot); _pot = _pot + 1; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); final L2Npc ward = addSpawn(GRAIL_WARD, new Location(b.getX(), b.getY(), b.getZ()), true, 0); ((L2Attackable) ward).addDamageHate(_nextTarget, 0, 999); - ward.setIsRunning(true); + ward.setRunning(); ward.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _nextTarget, null); startQuestTimer("GUARD_ATTACK", 1000, ward, _nextTarget, true); startQuestTimer("SUICIDE", 20000, ward, null); @@ -127,7 +127,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } npc.doDie(null); @@ -175,7 +175,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a70e0d4d26..cca025f7bd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -358,7 +358,7 @@ public final class Baium extends AbstractNpcAI { mob.clearAggroList(); } - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(_baium, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _baium); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index bb3269b53a..51b3c7f53a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -153,7 +153,7 @@ public final class BalokWarzone extends AbstractInstance L2Npc minion = minionList.get(Rnd.get(minionList.size())); if (minion != null) { - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setCanReturnToSpawnPoint(false); currentMinion = minion; getTimers().addTimer("stage_last_minion_walk", 2000, minion, player); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java index 6d4860e00b..77d7907440 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java @@ -75,7 +75,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((mob.getId() == ARCHERY_KNIGHT) && !mob.isDead() && !mob.isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob); ((L2Attackable) npc).addDamageHate(mob, 0, 999999); } @@ -151,7 +151,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((mob.getId() == ARCHERY_KNIGHT) && !mob.isDead() && !mob.isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob); ((L2Attackable) npc).addDamageHate(mob, 0, 999999); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 92b19efcf5..351d4b0ea5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -382,7 +382,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (npc.getVariables().getInt("FREYA_MOVE") == 0) { controller.getVariables().set("FREYA_MOVE", 1); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } break; @@ -431,14 +431,14 @@ public final class IceQueensCastleBattle extends AbstractInstance manageScreenMsg(world, NpcStringId.BEGIN_STAGE_4); final FriendlyNpcInstance jinia = (FriendlyNpcInstance) addSpawn(SUPP_JINIA, SUPP_JINIA_SPAWN, false, 0, true, world.getId()); - jinia.setIsRunning(true); + jinia.setRunning(); jinia.setIsInvul(true); jinia.setCanReturnToSpawnPoint(false); jinia.reduceCurrentHp(1, freya, null); // TODO: Find better way for attack freya.reduceCurrentHp(1, jinia, null); final FriendlyNpcInstance kegor = (FriendlyNpcInstance) addSpawn(SUPP_KEGOR, SUPP_KEGOR_SPAWN, false, 0, true, world.getId()); - kegor.setIsRunning(true); + kegor.setRunning(); kegor.setIsInvul(true); kegor.setCanReturnToSpawnPoint(false); kegor.reduceCurrentHp(1, freya, null); // TODO: Find better way for attack @@ -673,7 +673,7 @@ public final class IceQueensCastleBattle extends AbstractInstance for (int i = 0; i < 3; i++) { final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), true, 0, false, world.getId()); - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(mob.getMostHated(), 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob.getMostHated()); startQuestTimer("BLIZZARD", 20000, breath, null); @@ -751,7 +751,7 @@ public final class IceQueensCastleBattle extends AbstractInstance { controller.getVariables().set("FREYA_MOVE", 1); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -825,7 +825,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (controller.getVariables().getInt("FREYA_MOVE") == 0) { controller.getVariables().set("FREYA_MOVE", 1); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1042,7 +1042,7 @@ public final class IceQueensCastleBattle extends AbstractInstance final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), false, 0, false, world.getId()); if (player != null) { - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(player, 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } @@ -1116,7 +1116,7 @@ public final class IceQueensCastleBattle extends AbstractInstance manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); final L2Npc freya = params.getObject("freya", L2Npc.class); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1173,7 +1173,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (target != null) { ((L2Attackable) mob).addDamageHate(target, 0, 999); - mob.setIsRunning(true); + mob.setRunning(); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } else diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a19a9f836b..b7a53df3d6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -201,14 +201,14 @@ public class Kelbim extends AbstractNpcAI for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) { L2Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) { L2Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 51ee3bad82..ff290b7fab 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -103,7 +103,7 @@ public final class KimerianCommon extends AbstractInstance } else if (!npc.isAttackingNow() && (distance > 250)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23); } else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) @@ -270,7 +270,7 @@ public final class KimerianCommon extends AbstractInstance getTimers().addTimer("KIMERIAN_CHAT_1", 5000, t -> kimerian.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_COME_BACK_ALIVE_WITH_ROTTING_AURA)); getTimers().addTimer("KIMERIAN_RUN", 6000, t -> { - kimerian.setIsRunning(true); + kimerian.setRunning(); addMoveToDesire(kimerian, loc, 23); kimerian.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HA_HA_HA_HA); }); @@ -309,7 +309,7 @@ public final class KimerianCommon extends AbstractInstance case NEOMI_KASHERON: { npc.initSeenCreatures(); - npc.setIsRunning(true); + npc.setRunning(); break; } case INVISIBLE_NPC: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java index d9bf024d24..91c2ed7533 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java @@ -140,14 +140,14 @@ public class Vortex extends AbstractNpcAI { attackRandomTarget(npc); npc.setRandomWalking(true); - npc.setIsRunning(true); + npc.setRunning(); break; } case BIG_VORTEX: { attackRandomTarget(npc); npc.setRandomWalking(true); - npc.setIsRunning(true); + npc.setRunning(); break; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index c6f024c42c..94a080c937 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -187,7 +187,7 @@ public final class OctavisWarzone extends AbstractInstance ((L2Attackable) beasts).setCanReturnToSpawnPoint(false); final L2Npc octavis = addSpawn((!isExtremeMode(world) ? OCTAVIS_STAGE_1[0] : OCTAVIS_STAGE_1[1]), OCTAVIS_SPAWN_LOC, false, 0, false, world.getId()); octavis.disableCoreAI(true); - octavis.setIsRunning(true); + octavis.setRunning(); octavis.sendChannelingEffect(beasts, 1); octavis.setTargetable(false); ((L2Attackable) octavis).setCanReturnToSpawnPoint(false); @@ -286,7 +286,7 @@ public final class OctavisWarzone extends AbstractInstance if ((moveX != 0) && (moveY != 0)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, new Location(moveX, moveY, -10008), 23); } break; @@ -299,7 +299,7 @@ public final class OctavisWarzone extends AbstractInstance for (int i = 0; i < count; i++) { final L2Npc beast = addSpawn((!isExtremeMode(world) ? BEASTS_MINIONS[0] : BEASTS_MINIONS[1]), loc, false, 0, false, world.getId()); - beast.setIsRunning(true); + beast.setRunning(); ((L2Attackable) beast).setCanReturnToSpawnPoint(false); addMoveToDesire(beast, Util.getRandomPosition(BEASTS_RANDOM_POINT, 500, 500), 23); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Minigame/Minigame.java index 0c5846b39c..3fbeed5ae7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Minigame/Minigame.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Minigame/Minigame.java @@ -110,14 +110,14 @@ public final class Minigame extends AbstractNpcAI if (npc.getId() == BURNER) { npc.setDisplayEffect(2); - npc.setIsRunning(false); + npc.setWalking(); } else { for (L2Npc burner : room.getBurners()) { burner.setDisplayEffect(2); - burner.setIsRunning(false); + burner.setWalking(); } } break; @@ -145,7 +145,7 @@ public final class Minigame extends AbstractNpcAI { final L2Npc b = room.getBurners()[room.getOrder()[room.getCurrentPot()]]; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); startQuestTimer("off", 2000, b, null); // Stopping burning each pot 2s after startQuestTimer("timer", TIMER_INTERVAL * 1000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); @@ -276,7 +276,7 @@ public final class Minigame extends AbstractNpcAI if (room.getCurrentPot() < 8) { npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); startQuestTimer("off", 2000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); } @@ -419,7 +419,7 @@ public final class Minigame extends AbstractNpcAI for (L2Npc burner : _burners) { burner.setDisplayEffect(1); - burner.setIsRunning(false); + burner.setWalking(); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 193f623abd..ae4549f39f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -186,7 +186,7 @@ public final class SummonNpc extends AbstractEffect { npc.scheduleDespawn(_despawnDelay); } - npc.setIsRunning(false); // TODO: Fix broadcast info. + npc.setWalking(); // TODO: Fix broadcast info. } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/RunWalk.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/RunWalk.java index 0d5d0d9384..c5fa6aa3f1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/RunWalk.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/RunWalk.java @@ -22,13 +22,20 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; /** * Run/Walk player action handler. - * @author UnAfraid + * @author Mobius */ public final class RunWalk implements IPlayerActionHandler { @Override public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed) { - activeChar.setIsRunning(!activeChar.isRunning()); + if (activeChar.isRunning()) + { + activeChar.setWalking(); + } + else + { + activeChar.setRunning(); + } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 83cd0ac7d3..c0c1bba266 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -226,7 +226,7 @@ public final class ChamberOfProphecies extends AbstractInstance case "ATTACK1": case "ATTACK2": { - npc.setIsRunning(true); + npc.setRunning(); ((L2Attackable) npc).setCanReturnToSpawnPoint(false); ((L2Attackable) npc).setCanStopAttackByTime(false); if (npc.isScriptValue(0) && world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index d499d74b31..fe268f6cd0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -119,7 +119,7 @@ public final class KartiaHelperAdolph extends AbstractNpcAI if (!npc.isInsideRadius(loc, 50, true, true)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index 031dddadc4..374348ece8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -88,7 +88,7 @@ public final class KartiaHelperBarton extends AbstractNpcAI } else { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e58c7fa851..a667ca8510 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -227,7 +227,7 @@ public final class KartiaHelperElise extends AbstractNpcAI } else { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 1c08fce80a..b633afc228 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -284,7 +284,7 @@ public final class KartiasLabyrinth extends AbstractInstance { final Location loc = instance.getTemplateParameters().getLocation("middlePointRoom1"); final Location moveTo = new Location(loc.getX() + getRandom(-100, 100), loc.getY() + getRandom(-100, 100), loc.getZ()); - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, moveTo, 6); getTimers().addTimer("START_MOVE", 15000, npc, null); } @@ -292,7 +292,7 @@ public final class KartiasLabyrinth extends AbstractInstance { final Location loc = instance.getTemplateParameters().getLocation("middlePointRoom3"); final Location moveTo = new Location(loc.getX() + getRandom(-200, 200), loc.getY() + getRandom(-200, 200), loc.getZ()); - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, moveTo, 23); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index ca5fe1d144..4531bd01b2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -445,7 +445,7 @@ public final class LabyrinthOfBelis extends AbstractInstance public String onSpawn(L2Npc npc) { final L2Attackable officer = (L2Attackable) npc; - officer.setIsRunning(true); + officer.setRunning(); officer.setCanReturnToSpawnPoint(false); getTimers().addRepeatingTimer("MESSAGE", 6000, npc, null); return super.onSpawn(npc); @@ -499,7 +499,7 @@ public final class LabyrinthOfBelis extends AbstractInstance showOnScreenMsg(player, (getRandomBoolean() ? NpcStringId.IF_TERAIN_DIES_THE_MISSION_WILL_FAIL : NpcStringId.BEHIND_YOU_THE_ENEMY_IS_AMBUSHING_YOU), ExShowScreenMessage.TOP_CENTER, 4500); final L2Attackable mob = (L2Attackable) addSpawn((getRandomBoolean() ? OPERATIVE : HANDYMAN), SPAWN_ATTACKERS, false, 0, true, world.getId()); - mob.setIsRunning(true); + mob.setRunning(); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, ATTACKER_SPOT); mob.broadcastSay(ChatType.NPC_GENERAL, (getRandomBoolean() ? NpcStringId.KILL_THE_GUY_MESSING_WITH_THE_ELECTRIC_DEVICE : NpcStringId.FOCUS_ON_ATTACKING_THE_GUY_IN_THE_ROOM)); mob.addDamageHate(npc, 0, 9999); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 2f7ac24bd1..6e22603a10 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -283,7 +283,7 @@ public final class MemoryOfDisaster extends AbstractInstance case "AWAKENING_GUIDE": { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, AWAKENING_GUIDE_MOVE_1); - npc.setIsRunning(true); + npc.setRunning(); break; } default: @@ -323,13 +323,13 @@ public final class MemoryOfDisaster extends AbstractInstance } case WIRPHY: { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, WIRPHY_MOVE, 23); break; } case SILVERA: { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, SILVERA_MOVE, 23); break; } @@ -470,7 +470,7 @@ public final class MemoryOfDisaster extends AbstractInstance player.getInstanceWorld().spawnGroup("ROGIN").forEach(n -> { addMoveToDesire(n, ROGIN_MOVE, 23); - n.setIsRunning(true); + n.setRunning(); }); break; } @@ -583,7 +583,7 @@ public final class MemoryOfDisaster extends AbstractInstance { npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { - n.setIsRunning(true); + n.setRunning(); n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); @@ -915,7 +915,7 @@ public final class MemoryOfDisaster extends AbstractInstance { if (skill.getId() == SIEGE_GOLEM_SKILL_1.getSkillId()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().moveTo(GOLEM_MOVE); } break; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java index af8d5a5b97..c1e5238e74 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java @@ -84,7 +84,7 @@ public final class MithrilMine extends AbstractInstance for (L2Npc n : npcs) { n.setScriptValue(1); - n.setIsRunning(true); + n.setRunning(); n.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, npc); ((L2Attackable) n).addDamageHate(npc, 0, 999999); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index e1cf0c7526..1a1f6ed758 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -82,7 +82,7 @@ public final class MuseumDungeon extends AbstractInstance desk.getVariables().set("book", true); // Set Toyron - toyron.setIsRunning(true); + toyron.setRunning(); toyron.setCanReturnToSpawnPoint(false); } @@ -128,7 +128,7 @@ public final class MuseumDungeon extends AbstractInstance final List thiefs = world.spawnGroup("thiefs"); for (L2Npc thief : thiefs) { - thief.setIsRunning(true); + thief.setRunning(); addAttackPlayerDesire(thief, player); thief.broadcastSay(ChatType.NPC_GENERAL, THIEF_SHOUT[getRandom(2)]); } @@ -143,7 +143,7 @@ public final class MuseumDungeon extends AbstractInstance final List thiefs = world.spawnGroup("thiefs"); for (L2Npc thief : thiefs) { - thief.setIsRunning(true); + thief.setRunning(); } break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java index f2affd49bf..8f3d025600 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -352,7 +352,7 @@ public final class Nursery extends AbstractInstance if (getRandom(100) < 4) { final L2Npc maguen = addSpawn(MAGUEN, npc, false, 0, false, instance.getId()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().startFollow(killer); showOnScreenMsg(instance, NpcStringId.MAGUEN_APPEARANCE, ExShowScreenMessage.MIDDLE_CENTER, 4000); getTimers().addTimer("MAGUEN_WAIT_TIMER", 4000, maguen, killer); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java index 2e91b4c520..5fbcd08676 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java @@ -184,7 +184,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance { npc.disableCoreAI(true); npc.setScriptValue(1); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, LEMATAN_PORT_POINT); } break; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java index edce534b9e..646d5622be 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java @@ -87,7 +87,7 @@ public final class SSQLibraryOfSages extends AbstractInstance } case "FOLLOW": { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); npc.broadcastSay(ChatType.NPC_GENERAL, ELCADIA_DIALOGS[getRandom(ELCADIA_DIALOGS.length)]); startQuestTimer("FOLLOW", 10000, npc, player); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java index fcfb319c56..a6e227675e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java @@ -194,7 +194,7 @@ public final class SSQMonasteryOfSilence extends AbstractInstance { return null; } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); if (player.isInCombat()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index fb2c3e2d4f..48f101724b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -87,7 +87,7 @@ public final class TalkingIslandPast extends AbstractInstance { final L2Npc knight = addSpawn(MYSTERIOUS_DARK_KNIGHT, TI_LOC_3, false, 0, false, instance.getId()); knight.getAI().startFollow(player); - knight.setIsRunning(true); + knight.setRunning(); showOnScreenMsg(player, NpcStringId.A_MYSTERIOUS_DARK_KNIGHT_IS_HERE, ExShowScreenMessage.TOP_CENTER, 5000); getTimers().addTimer("MSG", null, 5000, null, player, n -> showOnScreenMsg(n.getPlayer(), NpcStringId.TALK_TO_THE_MYSTERIOUS_DARK_KNIGHT, ExShowScreenMessage.TOP_CENTER, 5000)); } @@ -129,7 +129,7 @@ public final class TalkingIslandPast extends AbstractInstance qs.setMemoState(2); final L2Npc knight = addSpawn(MYSTERIOUS_DARK_KNIGHT, loc, false, 0, false, instance.getId()); knight.getAI().startFollow(player); - knight.setIsRunning(true); + knight.setRunning(); showOnScreenMsg(player, NpcStringId.A_MYSTERIOUS_DARK_KNIGHT_IS_HERE, ExShowScreenMessage.TOP_CENTER, 5000); getTimers().addTimer("MSG", null, 5000, npc, player, n -> showOnScreenMsg(n.getPlayer(), NpcStringId.TALK_TO_THE_MYSTERIOUS_DARK_KNIGHT, ExShowScreenMessage.TOP_CENTER, 5000)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java index 372f446bc8..fface8a39d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java @@ -153,7 +153,7 @@ public final class Q10326_RespectYourElders extends Quest { npc.getVariables().set("OWNER", player); npc.setTitle(player.getName()); - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, HANDERMONKEY_LOC[0], 0); npc.getVariables().set("MOVE_INDEX", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java index a2c9e77d46..69073a25ef 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java @@ -188,7 +188,7 @@ public final class Q10329_BackupSeekers extends Quest if (qs.isMemoState(1)) { npc.setSummoner(player); - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, BART_LOC_1[0], 0); npc.getVariables().set("MOVE_INDEX", 0); @@ -199,7 +199,7 @@ public final class Q10329_BackupSeekers extends Quest else if (qs.isMemoState(2)) { npc.setSummoner(player); - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, BART_LOC_2[0], 0); npc.getVariables().set("MOVE_INDEX", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java index 61a2a24a9a..3f8a11d4ef 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java @@ -203,7 +203,7 @@ public final class Q10365_SeekerEscort extends Quest { if (qs.isMemoState(1)) { - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, BLOODHOUND_LOC_1[0], 0); npc.getVariables().set("MOVE_INDEX", 0); @@ -211,7 +211,7 @@ public final class Q10365_SeekerEscort extends Quest } else if (qs.isMemoState(2)) { - npc.setIsRunning(true); + npc.setRunning(); npc.broadcastInfo(); addMoveToDesire(npc, BLOODHOUND_LOC_2[0], 0); npc.getVariables().set("MOVE_INDEX", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index 2c1af2741a..ee08afc59a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -110,7 +110,7 @@ public final class Q10742_AFurryFriend extends Quest final L2Npc ricky = addSpawn(RICKY, player, true, 120000); ricky.setSummoner(player); ricky.setTitle(player.getName()); - ricky.setIsRunning(true); + ricky.setRunning(); ricky.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); startQuestTimer("CHECK_RICKY_DISTANCE", 2500, ricky, player); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 1da1b21546..4fd0b4e8b5 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -676,7 +676,10 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable // Set the AI Intention to AI_INTENTION_ACTIVE setIntention(AI_INTENTION_ACTIVE); - npc.setWalking(); + if (!_actor.isFakePlayer()) + { + npc.setWalking(); + } return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index 7eb1fba95c..31b5b6bb8a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -825,7 +825,7 @@ public class L2CharacterAI extends AbstractAI // Kill the actor client side by sending Server->Client packet AutoAttackStop, StopMove/StopRotation, Die (broadcast) clientNotifyDead(); - if (!_actor.isPlayable()) + if (!_actor.isPlayable() && !_actor.isFakePlayer()) { _actor.setWalking(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java index 3da5ea144c..b56e5922f7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java @@ -299,7 +299,14 @@ public final class WalkingManager implements IGameXmlReader } npc.sendDebugMessage("Starting to move at route '" + routeName + "'"); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setWalkCheckTask(ThreadPoolManager.scheduleAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight @@ -332,7 +339,14 @@ public final class WalkingManager implements IGameXmlReader walk.setBlocked(true); final L2NpcWalkerNode node = walk.getCurrentNode(); npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId()); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setBlocked(false); walk.setStoppedByAttack(false); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index ddc1a1b8d4..e9b8952567 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -768,7 +768,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } return; } @@ -786,7 +789,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } } @@ -1407,14 +1413,16 @@ public class L2Attackable extends L2Npc setScriptValue(0); // remove pvp flag setRunning(); // don't walk } + else + { + setWalking(); + } // Clear mod Seeded stat _seeded = false; _seed = null; _seederObjId = 0; - setWalking(); - // check the region where this mob is, do not activate the AI if region is inactive. // if (!isInActiveRegion()) // { @@ -1745,7 +1753,10 @@ public class L2Attackable extends L2Npc { ((L2AttackableAI) getAI()).setGlobalAggro(-25); } - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } clearAggroList(); } getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 6dd50e079f..c974146ecb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -2311,7 +2311,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return _isRunning; } - public final void setIsRunning(boolean value) + private final void setIsRunning(boolean value) { if (_isRunning == value) { @@ -2359,10 +2359,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance. */ public final void setRunning() { - if (!isRunning()) - { - setIsRunning(true); - } + setIsRunning(true); } public final boolean hasBlockActions() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index d62c0be382..e7e77b497a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -3199,7 +3199,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { ((L2Attackable) npc).addDamageHate(target, 0, desire); } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -3210,7 +3210,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime */ protected void addAttackDesire(L2Npc npc, L2Character target) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java index 22edf5dc0b..14b0ae497c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java @@ -175,7 +175,7 @@ public final class Apherus extends AbstractNpcAI for (int i = 0; i < 4; i++) { final L2MonsterInstance protector = (L2MonsterInstance) addSpawn(APHERUS_DOOR_GUARD[getRandom(APHERUS_DOOR_GUARD.length)], player.getX() + getRandom(10, 30), player.getY() + getRandom(10, 30), player.getZ(), 0, false, 600000, false); - protector.setIsRunning(true); + protector.setRunning(); protector.setTarget(player); addAttackPlayerDesire(protector, player); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java index 97a51dab77..cba2edd6c4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java @@ -147,7 +147,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI { if ((monster.getId() == TANTA_MAGICIAN) || (monster.getId() == TANTA_SCOUT)) { - monster.setIsRunning(true); + monster.setRunning(); monster.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(npc.getX(), npc.getY(), npc.getZ(), 0)); } }); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 1ccd0b2a99..ae1f51b6b6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -143,7 +143,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -157,7 +157,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -168,7 +168,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -298,7 +298,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.setTarget(creature); npc.doCast(CREW_SKILL.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature); } return super.onSeeCreature(npc, creature, isSummon); @@ -424,7 +424,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.getVariables().set("SELFBUFF_USED", 1); npc.doCast(selfRangeBuff1.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java index 83fb8bb628..6fb7ee6231 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java @@ -94,7 +94,7 @@ public final class Maguen extends AbstractNpcAI final L2Npc maguen = addSpawn(MAGUEN, npc.getLocation(), true, 60000, true); maguen.getVariables().set("SUMMON_PLAYER", player); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java index 0659f059e8..f24f3fe291 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java @@ -85,7 +85,7 @@ public final class Nemo extends AbstractNpcAI maguen.getVariables().set("TEST_MAGUEN", 1); player.getVariables().set("TEST_MAGUEN", 1); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java index 30b0a619c6..20ea7f0c04 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java @@ -246,7 +246,7 @@ public final class SelMahumDrill extends AbstractNpcAI } receiver.disableCoreAI(true); receiver.getVariables().set("BUSY_STATE", 1); - receiver.setIsRunning(true); + receiver.setRunning(); receiver.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location((receiver.getX() + getRandom(-800, 800)), (receiver.getY() + getRandom(-800, 800)), receiver.getZ(), receiver.getHeading())); startQuestTimer("reset_busy_state", 5000, receiver, null); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java index f221a3c2fa..a489ec3d2b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java @@ -139,7 +139,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "fire_arrived": { // myself.i_quest0 = 1; - npc.setIsRunning(false); + npc.setWalking(); npc.setTarget(npc); if (!npc.isRandomWalkingEnabled()) @@ -172,7 +172,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "remove_effects": { // myself.i_quest0 = 0; - npc.setIsRunning(true); + npc.setRunning(); npc.setDisplayEffect(MAHUM_EFFECT_NONE); break; } @@ -244,7 +244,7 @@ public final class SelMahumSquad extends AbstractNpcAI if (receiver.isRandomWalkingEnabled() && !receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && CommonUtil.contains(SQUAD_LEADERS, receiver.getId())) { receiver.setRandomWalking(false); // Moving to fire - i_ai0 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); receiver.stopMove(null); @@ -279,7 +279,7 @@ public final class SelMahumSquad extends AbstractNpcAI } receiver.setRandomWalking(false); // Moving to fire - i_ai0 = 1 receiver.getVariables().set("BUSY_STATE", 1); // Eating - i_ai3 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); receiver.broadcastSay(ChatType.NPC_GENERAL, (getRandom(3) < 1) ? NpcStringId.LOOKS_DELICIOUS : NpcStringId.LET_S_GO_EAT); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); @@ -386,7 +386,7 @@ public final class SelMahumSquad extends AbstractNpcAI cancelQuestTimer("chef_set_invul", npc, null); npc.getVariables().remove("BUSY_STATE"); npc.getVariables().remove("INVUL_REMOVE_TIMER_STARTED"); - npc.setIsRunning(false); + npc.setWalking(); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java index f9a9f5b946..aca7158334 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java @@ -74,7 +74,7 @@ public final class BoyAndGirl extends AbstractNpcAI { startQuestTimer("NPC_CHANGEWEAP", 15000 + (getRandom(5) * 1000), npc, null); startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null); - npc.setIsRunning(true); + npc.setRunning(); final Location randomLoc = Util.getRandomPosition(npc.getSpawn().getLocation(), 200, 600); addMoveToDesire(npc, GeoEngine.getInstance().canMoveToTargetLoc(npc.getLocation().getX(), npc.getLocation().getY(), npc.getLocation().getZ(), randomLoc.getX(), randomLoc.getY(), randomLoc.getZ(), npc.getInstanceWorld()), 23); return super.onSpawn(npc); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Anais/Anais.java index ff5cbd1f36..c7f891b037 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Anais/Anais.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Anais/Anais.java @@ -58,7 +58,7 @@ public final class Anais extends AbstractNpcAI { final L2Npc npc = _divineBurners.get(pot); npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); if (pot < 4) { _current = npc; @@ -92,10 +92,10 @@ public final class Anais extends AbstractNpcAI final L2Npc b = _divineBurners.get(_pot); _pot = _pot + 1; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); final L2Npc ward = addSpawn(GRAIL_WARD, new Location(b.getX(), b.getY(), b.getZ()), true, 0); ((L2Attackable) ward).addDamageHate(_nextTarget, 0, 999); - ward.setIsRunning(true); + ward.setRunning(); ward.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _nextTarget, null); startQuestTimer("GUARD_ATTACK", 1000, ward, _nextTarget, true); startQuestTimer("SUICIDE", 20000, ward, null); @@ -127,7 +127,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } npc.doDie(null); @@ -175,7 +175,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a70e0d4d26..cca025f7bd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -358,7 +358,7 @@ public final class Baium extends AbstractNpcAI { mob.clearAggroList(); } - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(_baium, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _baium); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index bb3269b53a..51b3c7f53a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -153,7 +153,7 @@ public final class BalokWarzone extends AbstractInstance L2Npc minion = minionList.get(Rnd.get(minionList.size())); if (minion != null) { - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setCanReturnToSpawnPoint(false); currentMinion = minion; getTimers().addTimer("stage_last_minion_walk", 2000, minion, player); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java index 6d4860e00b..77d7907440 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java @@ -75,7 +75,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((mob.getId() == ARCHERY_KNIGHT) && !mob.isDead() && !mob.isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob); ((L2Attackable) npc).addDamageHate(mob, 0, 999999); } @@ -151,7 +151,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((mob.getId() == ARCHERY_KNIGHT) && !mob.isDead() && !mob.isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob); ((L2Attackable) npc).addDamageHate(mob, 0, 999999); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 92b19efcf5..351d4b0ea5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -382,7 +382,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (npc.getVariables().getInt("FREYA_MOVE") == 0) { controller.getVariables().set("FREYA_MOVE", 1); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } break; @@ -431,14 +431,14 @@ public final class IceQueensCastleBattle extends AbstractInstance manageScreenMsg(world, NpcStringId.BEGIN_STAGE_4); final FriendlyNpcInstance jinia = (FriendlyNpcInstance) addSpawn(SUPP_JINIA, SUPP_JINIA_SPAWN, false, 0, true, world.getId()); - jinia.setIsRunning(true); + jinia.setRunning(); jinia.setIsInvul(true); jinia.setCanReturnToSpawnPoint(false); jinia.reduceCurrentHp(1, freya, null); // TODO: Find better way for attack freya.reduceCurrentHp(1, jinia, null); final FriendlyNpcInstance kegor = (FriendlyNpcInstance) addSpawn(SUPP_KEGOR, SUPP_KEGOR_SPAWN, false, 0, true, world.getId()); - kegor.setIsRunning(true); + kegor.setRunning(); kegor.setIsInvul(true); kegor.setCanReturnToSpawnPoint(false); kegor.reduceCurrentHp(1, freya, null); // TODO: Find better way for attack @@ -673,7 +673,7 @@ public final class IceQueensCastleBattle extends AbstractInstance for (int i = 0; i < 3; i++) { final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), true, 0, false, world.getId()); - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(mob.getMostHated(), 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob.getMostHated()); startQuestTimer("BLIZZARD", 20000, breath, null); @@ -751,7 +751,7 @@ public final class IceQueensCastleBattle extends AbstractInstance { controller.getVariables().set("FREYA_MOVE", 1); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -825,7 +825,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (controller.getVariables().getInt("FREYA_MOVE") == 0) { controller.getVariables().set("FREYA_MOVE", 1); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1042,7 +1042,7 @@ public final class IceQueensCastleBattle extends AbstractInstance final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), false, 0, false, world.getId()); if (player != null) { - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(player, 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } @@ -1116,7 +1116,7 @@ public final class IceQueensCastleBattle extends AbstractInstance manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); final L2Npc freya = params.getObject("freya", L2Npc.class); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1173,7 +1173,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (target != null) { ((L2Attackable) mob).addDamageHate(target, 0, 999); - mob.setIsRunning(true); + mob.setRunning(); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } else diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a19a9f836b..b7a53df3d6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -201,14 +201,14 @@ public class Kelbim extends AbstractNpcAI for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) { L2Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) { L2Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 51ee3bad82..ff290b7fab 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -103,7 +103,7 @@ public final class KimerianCommon extends AbstractInstance } else if (!npc.isAttackingNow() && (distance > 250)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23); } else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) @@ -270,7 +270,7 @@ public final class KimerianCommon extends AbstractInstance getTimers().addTimer("KIMERIAN_CHAT_1", 5000, t -> kimerian.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_COME_BACK_ALIVE_WITH_ROTTING_AURA)); getTimers().addTimer("KIMERIAN_RUN", 6000, t -> { - kimerian.setIsRunning(true); + kimerian.setRunning(); addMoveToDesire(kimerian, loc, 23); kimerian.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HA_HA_HA_HA); }); @@ -309,7 +309,7 @@ public final class KimerianCommon extends AbstractInstance case NEOMI_KASHERON: { npc.initSeenCreatures(); - npc.setIsRunning(true); + npc.setRunning(); break; } case INVISIBLE_NPC: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java index d9bf024d24..91c2ed7533 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java @@ -140,14 +140,14 @@ public class Vortex extends AbstractNpcAI { attackRandomTarget(npc); npc.setRandomWalking(true); - npc.setIsRunning(true); + npc.setRunning(); break; } case BIG_VORTEX: { attackRandomTarget(npc); npc.setRandomWalking(true); - npc.setIsRunning(true); + npc.setRunning(); break; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index c6f024c42c..94a080c937 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -187,7 +187,7 @@ public final class OctavisWarzone extends AbstractInstance ((L2Attackable) beasts).setCanReturnToSpawnPoint(false); final L2Npc octavis = addSpawn((!isExtremeMode(world) ? OCTAVIS_STAGE_1[0] : OCTAVIS_STAGE_1[1]), OCTAVIS_SPAWN_LOC, false, 0, false, world.getId()); octavis.disableCoreAI(true); - octavis.setIsRunning(true); + octavis.setRunning(); octavis.sendChannelingEffect(beasts, 1); octavis.setTargetable(false); ((L2Attackable) octavis).setCanReturnToSpawnPoint(false); @@ -286,7 +286,7 @@ public final class OctavisWarzone extends AbstractInstance if ((moveX != 0) && (moveY != 0)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, new Location(moveX, moveY, -10008), 23); } break; @@ -299,7 +299,7 @@ public final class OctavisWarzone extends AbstractInstance for (int i = 0; i < count; i++) { final L2Npc beast = addSpawn((!isExtremeMode(world) ? BEASTS_MINIONS[0] : BEASTS_MINIONS[1]), loc, false, 0, false, world.getId()); - beast.setIsRunning(true); + beast.setRunning(); ((L2Attackable) beast).setCanReturnToSpawnPoint(false); addMoveToDesire(beast, Util.getRandomPosition(BEASTS_RANDOM_POINT, 500, 500), 23); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index a64e79beb9..5495129f10 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -153,7 +153,7 @@ public class Ramona extends AbstractNpcAI for (int i = 0; i < 7; i++) { final L2Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], npc.getX() + getRandom(-200, 200), npc.getY() + getRandom(-200, 200), npc.getZ(), npc.getHeading(), false, 600000); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); _minions.add(minion); @@ -179,7 +179,7 @@ public class Ramona extends AbstractNpcAI for (int i = 0; i < 7; i++) { final L2Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], npc.getX() + getRandom(-200, 200), npc.getY() + getRandom(-200, 200), npc.getZ(), npc.getHeading(), false, 600000); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); _minions.add(minion); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Minigame/Minigame.java index 0c5846b39c..3fbeed5ae7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Minigame/Minigame.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Minigame/Minigame.java @@ -110,14 +110,14 @@ public final class Minigame extends AbstractNpcAI if (npc.getId() == BURNER) { npc.setDisplayEffect(2); - npc.setIsRunning(false); + npc.setWalking(); } else { for (L2Npc burner : room.getBurners()) { burner.setDisplayEffect(2); - burner.setIsRunning(false); + burner.setWalking(); } } break; @@ -145,7 +145,7 @@ public final class Minigame extends AbstractNpcAI { final L2Npc b = room.getBurners()[room.getOrder()[room.getCurrentPot()]]; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); startQuestTimer("off", 2000, b, null); // Stopping burning each pot 2s after startQuestTimer("timer", TIMER_INTERVAL * 1000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); @@ -276,7 +276,7 @@ public final class Minigame extends AbstractNpcAI if (room.getCurrentPot() < 8) { npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); startQuestTimer("off", 2000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); } @@ -419,7 +419,7 @@ public final class Minigame extends AbstractNpcAI for (L2Npc burner : _burners) { burner.setDisplayEffect(1); - burner.setIsRunning(false); + burner.setWalking(); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 193f623abd..ae4549f39f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -186,7 +186,7 @@ public final class SummonNpc extends AbstractEffect { npc.scheduleDespawn(_despawnDelay); } - npc.setIsRunning(false); // TODO: Fix broadcast info. + npc.setWalking(); // TODO: Fix broadcast info. } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/RunWalk.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/RunWalk.java index 0d5d0d9384..c5fa6aa3f1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/RunWalk.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/RunWalk.java @@ -22,13 +22,20 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; /** * Run/Walk player action handler. - * @author UnAfraid + * @author Mobius */ public final class RunWalk implements IPlayerActionHandler { @Override public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed) { - activeChar.setIsRunning(!activeChar.isRunning()); + if (activeChar.isRunning()) + { + activeChar.setWalking(); + } + else + { + activeChar.setRunning(); + } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 83cd0ac7d3..c0c1bba266 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -226,7 +226,7 @@ public final class ChamberOfProphecies extends AbstractInstance case "ATTACK1": case "ATTACK2": { - npc.setIsRunning(true); + npc.setRunning(); ((L2Attackable) npc).setCanReturnToSpawnPoint(false); ((L2Attackable) npc).setCanStopAttackByTime(false); if (npc.isScriptValue(0) && world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index d499d74b31..fe268f6cd0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -119,7 +119,7 @@ public final class KartiaHelperAdolph extends AbstractNpcAI if (!npc.isInsideRadius(loc, 50, true, true)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index 031dddadc4..374348ece8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -88,7 +88,7 @@ public final class KartiaHelperBarton extends AbstractNpcAI } else { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e58c7fa851..a667ca8510 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -227,7 +227,7 @@ public final class KartiaHelperElise extends AbstractNpcAI } else { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 1c08fce80a..b633afc228 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -284,7 +284,7 @@ public final class KartiasLabyrinth extends AbstractInstance { final Location loc = instance.getTemplateParameters().getLocation("middlePointRoom1"); final Location moveTo = new Location(loc.getX() + getRandom(-100, 100), loc.getY() + getRandom(-100, 100), loc.getZ()); - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, moveTo, 6); getTimers().addTimer("START_MOVE", 15000, npc, null); } @@ -292,7 +292,7 @@ public final class KartiasLabyrinth extends AbstractInstance { final Location loc = instance.getTemplateParameters().getLocation("middlePointRoom3"); final Location moveTo = new Location(loc.getX() + getRandom(-200, 200), loc.getY() + getRandom(-200, 200), loc.getZ()); - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, moveTo, 23); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index eb38111778..2d3a9d525d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -444,7 +444,7 @@ public final class LabyrinthOfBelis extends AbstractInstance public String onSpawn(L2Npc npc) { final L2Attackable officer = (L2Attackable) npc; - officer.setIsRunning(true); + officer.setRunning(); officer.setCanReturnToSpawnPoint(false); getTimers().addRepeatingTimer("MESSAGE", 6000, npc, null); return super.onSpawn(npc); @@ -498,7 +498,7 @@ public final class LabyrinthOfBelis extends AbstractInstance showOnScreenMsg(player, (getRandomBoolean() ? NpcStringId.IF_TERAIN_DIES_THE_MISSION_WILL_FAIL : NpcStringId.BEHIND_YOU_THE_ENEMY_IS_AMBUSHING_YOU), ExShowScreenMessage.TOP_CENTER, 4500); final L2Attackable mob = (L2Attackable) addSpawn((getRandomBoolean() ? OPERATIVE : HANDYMAN), SPAWN_ATTACKERS, false, 0, true, world.getId()); - mob.setIsRunning(true); + mob.setRunning(); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, ATTACKER_SPOT); mob.broadcastSay(ChatType.NPC_GENERAL, (getRandomBoolean() ? NpcStringId.KILL_THE_GUY_MESSING_WITH_THE_ELECTRIC_DEVICE : NpcStringId.FOCUS_ON_ATTACKING_THE_GUY_IN_THE_ROOM)); mob.addDamageHate(npc, 0, 9999); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 2f7ac24bd1..6e22603a10 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -283,7 +283,7 @@ public final class MemoryOfDisaster extends AbstractInstance case "AWAKENING_GUIDE": { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, AWAKENING_GUIDE_MOVE_1); - npc.setIsRunning(true); + npc.setRunning(); break; } default: @@ -323,13 +323,13 @@ public final class MemoryOfDisaster extends AbstractInstance } case WIRPHY: { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, WIRPHY_MOVE, 23); break; } case SILVERA: { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, SILVERA_MOVE, 23); break; } @@ -470,7 +470,7 @@ public final class MemoryOfDisaster extends AbstractInstance player.getInstanceWorld().spawnGroup("ROGIN").forEach(n -> { addMoveToDesire(n, ROGIN_MOVE, 23); - n.setIsRunning(true); + n.setRunning(); }); break; } @@ -583,7 +583,7 @@ public final class MemoryOfDisaster extends AbstractInstance { npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { - n.setIsRunning(true); + n.setRunning(); n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); @@ -915,7 +915,7 @@ public final class MemoryOfDisaster extends AbstractInstance { if (skill.getId() == SIEGE_GOLEM_SKILL_1.getSkillId()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().moveTo(GOLEM_MOVE); } break; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java index af8d5a5b97..c1e5238e74 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java @@ -84,7 +84,7 @@ public final class MithrilMine extends AbstractInstance for (L2Npc n : npcs) { n.setScriptValue(1); - n.setIsRunning(true); + n.setRunning(); n.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, npc); ((L2Attackable) n).addDamageHate(npc, 0, 999999); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index 900b51ba44..6a72aa4c64 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -94,7 +94,7 @@ public final class MuseumDungeon extends AbstractInstance desk.getVariables().set("book", true); // Set Toyron - toyron.setIsRunning(true); + toyron.setRunning(); toyron.setCanReturnToSpawnPoint(false); } @@ -120,7 +120,7 @@ public final class MuseumDungeon extends AbstractInstance if (instance.getNpcs(THIEF).isEmpty()) { - instance.spawnGroup("thiefs").forEach(npc -> npc.setIsRunning(true)); + instance.spawnGroup("thiefs").forEach(npc -> npc.setRunning()); } } } @@ -172,14 +172,14 @@ public final class MuseumDungeon extends AbstractInstance case "TOYRON_FOLLOW": { toyron.getAI().startFollow(player); - toyron.setIsRunning(true); + toyron.setRunning(); break; } case "SPAWN_THIEFS_STAGE_1": { instance.spawnGroup("thiefs").forEach(thief -> { - thief.setIsRunning(true); + thief.setRunning(); addAttackPlayerDesire(thief, player); thief.broadcastSay(ChatType.NPC_GENERAL, THIEF_SHOUT[getRandom(2)]); }); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java index f2affd49bf..8f3d025600 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -352,7 +352,7 @@ public final class Nursery extends AbstractInstance if (getRandom(100) < 4) { final L2Npc maguen = addSpawn(MAGUEN, npc, false, 0, false, instance.getId()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().startFollow(killer); showOnScreenMsg(instance, NpcStringId.MAGUEN_APPEARANCE, ExShowScreenMessage.MIDDLE_CENTER, 4000); getTimers().addTimer("MAGUEN_WAIT_TIMER", 4000, maguen, killer); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java index 2e91b4c520..5fbcd08676 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java @@ -184,7 +184,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance { npc.disableCoreAI(true); npc.setScriptValue(1); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, LEMATAN_PORT_POINT); } break; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java index edce534b9e..646d5622be 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java @@ -87,7 +87,7 @@ public final class SSQLibraryOfSages extends AbstractInstance } case "FOLLOW": { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); npc.broadcastSay(ChatType.NPC_GENERAL, ELCADIA_DIALOGS[getRandom(ELCADIA_DIALOGS.length)]); startQuestTimer("FOLLOW", 10000, npc, player); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java index fcfb319c56..a6e227675e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java @@ -194,7 +194,7 @@ public final class SSQMonasteryOfSilence extends AbstractInstance { return null; } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); if (player.isInCombat()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index fb2c3e2d4f..48f101724b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -87,7 +87,7 @@ public final class TalkingIslandPast extends AbstractInstance { final L2Npc knight = addSpawn(MYSTERIOUS_DARK_KNIGHT, TI_LOC_3, false, 0, false, instance.getId()); knight.getAI().startFollow(player); - knight.setIsRunning(true); + knight.setRunning(); showOnScreenMsg(player, NpcStringId.A_MYSTERIOUS_DARK_KNIGHT_IS_HERE, ExShowScreenMessage.TOP_CENTER, 5000); getTimers().addTimer("MSG", null, 5000, null, player, n -> showOnScreenMsg(n.getPlayer(), NpcStringId.TALK_TO_THE_MYSTERIOUS_DARK_KNIGHT, ExShowScreenMessage.TOP_CENTER, 5000)); } @@ -129,7 +129,7 @@ public final class TalkingIslandPast extends AbstractInstance qs.setMemoState(2); final L2Npc knight = addSpawn(MYSTERIOUS_DARK_KNIGHT, loc, false, 0, false, instance.getId()); knight.getAI().startFollow(player); - knight.setIsRunning(true); + knight.setRunning(); showOnScreenMsg(player, NpcStringId.A_MYSTERIOUS_DARK_KNIGHT_IS_HERE, ExShowScreenMessage.TOP_CENTER, 5000); getTimers().addTimer("MSG", null, 5000, npc, player, n -> showOnScreenMsg(n.getPlayer(), NpcStringId.TALK_TO_THE_MYSTERIOUS_DARK_KNIGHT, ExShowScreenMessage.TOP_CENTER, 5000)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index 2c1af2741a..ee08afc59a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -110,7 +110,7 @@ public final class Q10742_AFurryFriend extends Quest final L2Npc ricky = addSpawn(RICKY, player, true, 120000); ricky.setSummoner(player); ricky.setTitle(player.getName()); - ricky.setIsRunning(true); + ricky.setRunning(); ricky.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); startQuestTimer("CHECK_RICKY_DISTANCE", 2500, ricky, player); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 1da1b21546..4fd0b4e8b5 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -676,7 +676,10 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable // Set the AI Intention to AI_INTENTION_ACTIVE setIntention(AI_INTENTION_ACTIVE); - npc.setWalking(); + if (!_actor.isFakePlayer()) + { + npc.setWalking(); + } return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index 7eb1fba95c..31b5b6bb8a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -825,7 +825,7 @@ public class L2CharacterAI extends AbstractAI // Kill the actor client side by sending Server->Client packet AutoAttackStop, StopMove/StopRotation, Die (broadcast) clientNotifyDead(); - if (!_actor.isPlayable()) + if (!_actor.isPlayable() && !_actor.isFakePlayer()) { _actor.setWalking(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java index 3da5ea144c..b56e5922f7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java @@ -299,7 +299,14 @@ public final class WalkingManager implements IGameXmlReader } npc.sendDebugMessage("Starting to move at route '" + routeName + "'"); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setWalkCheckTask(ThreadPoolManager.scheduleAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight @@ -332,7 +339,14 @@ public final class WalkingManager implements IGameXmlReader walk.setBlocked(true); final L2NpcWalkerNode node = walk.getCurrentNode(); npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId()); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setBlocked(false); walk.setStoppedByAttack(false); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index ddc1a1b8d4..e9b8952567 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -768,7 +768,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } return; } @@ -786,7 +789,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } } @@ -1407,14 +1413,16 @@ public class L2Attackable extends L2Npc setScriptValue(0); // remove pvp flag setRunning(); // don't walk } + else + { + setWalking(); + } // Clear mod Seeded stat _seeded = false; _seed = null; _seederObjId = 0; - setWalking(); - // check the region where this mob is, do not activate the AI if region is inactive. // if (!isInActiveRegion()) // { @@ -1745,7 +1753,10 @@ public class L2Attackable extends L2Npc { ((L2AttackableAI) getAI()).setGlobalAggro(-25); } - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } clearAggroList(); } getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 6dd50e079f..c974146ecb 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -2311,7 +2311,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return _isRunning; } - public final void setIsRunning(boolean value) + private final void setIsRunning(boolean value) { if (_isRunning == value) { @@ -2359,10 +2359,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance. */ public final void setRunning() { - if (!isRunning()) - { - setIsRunning(true); - } + setIsRunning(true); } public final boolean hasBlockActions() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 64b9ccdcb0..c100d063ca 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -3211,7 +3211,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { ((L2Attackable) npc).addDamageHate(target, 0, desire); } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -3222,7 +3222,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime */ protected void addAttackDesire(L2Npc npc, L2Character target) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java index 22edf5dc0b..14b0ae497c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfGenesis/Apherus/Apherus.java @@ -175,7 +175,7 @@ public final class Apherus extends AbstractNpcAI for (int i = 0; i < 4; i++) { final L2MonsterInstance protector = (L2MonsterInstance) addSpawn(APHERUS_DOOR_GUARD[getRandom(APHERUS_DOOR_GUARD.length)], player.getX() + getRandom(10, 30), player.getY() + getRandom(10, 30), player.getZ(), 0, false, 600000, false); - protector.setIsRunning(true); + protector.setRunning(); protector.setTarget(player); addAttackPlayerDesire(protector, player); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java index 97a51dab77..cba2edd6c4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java @@ -147,7 +147,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI { if ((monster.getId() == TANTA_MAGICIAN) || (monster.getId() == TANTA_SCOUT)) { - monster.setIsRunning(true); + monster.setRunning(); monster.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(npc.getX(), npc.getY(), npc.getZ(), 0)); } }); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 1ccd0b2a99..ae1f51b6b6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -143,7 +143,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -157,7 +157,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -168,7 +168,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -298,7 +298,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.setTarget(creature); npc.doCast(CREW_SKILL.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature); } return super.onSeeCreature(npc, creature, isSummon); @@ -424,7 +424,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.getVariables().set("SELFBUFF_USED", 1); npc.doCast(selfRangeBuff1.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java index 83fb8bb628..6fb7ee6231 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Maguen.java @@ -94,7 +94,7 @@ public final class Maguen extends AbstractNpcAI final L2Npc maguen = addSpawn(MAGUEN, npc.getLocation(), true, 60000, true); maguen.getVariables().set("SUMMON_PLAYER", player); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java index 0659f059e8..f24f3fe291 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/Nemo/Nemo.java @@ -85,7 +85,7 @@ public final class Nemo extends AbstractNpcAI maguen.getVariables().set("TEST_MAGUEN", 1); player.getVariables().set("TEST_MAGUEN", 1); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java index 30b0a619c6..20ea7f0c04 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java @@ -246,7 +246,7 @@ public final class SelMahumDrill extends AbstractNpcAI } receiver.disableCoreAI(true); receiver.getVariables().set("BUSY_STATE", 1); - receiver.setIsRunning(true); + receiver.setRunning(); receiver.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location((receiver.getX() + getRandom(-800, 800)), (receiver.getY() + getRandom(-800, 800)), receiver.getZ(), receiver.getHeading())); startQuestTimer("reset_busy_state", 5000, receiver, null); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java index f221a3c2fa..a489ec3d2b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java @@ -139,7 +139,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "fire_arrived": { // myself.i_quest0 = 1; - npc.setIsRunning(false); + npc.setWalking(); npc.setTarget(npc); if (!npc.isRandomWalkingEnabled()) @@ -172,7 +172,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "remove_effects": { // myself.i_quest0 = 0; - npc.setIsRunning(true); + npc.setRunning(); npc.setDisplayEffect(MAHUM_EFFECT_NONE); break; } @@ -244,7 +244,7 @@ public final class SelMahumSquad extends AbstractNpcAI if (receiver.isRandomWalkingEnabled() && !receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && CommonUtil.contains(SQUAD_LEADERS, receiver.getId())) { receiver.setRandomWalking(false); // Moving to fire - i_ai0 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); receiver.stopMove(null); @@ -279,7 +279,7 @@ public final class SelMahumSquad extends AbstractNpcAI } receiver.setRandomWalking(false); // Moving to fire - i_ai0 = 1 receiver.getVariables().set("BUSY_STATE", 1); // Eating - i_ai3 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); receiver.broadcastSay(ChatType.NPC_GENERAL, (getRandom(3) < 1) ? NpcStringId.LOOKS_DELICIOUS : NpcStringId.LET_S_GO_EAT); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); @@ -386,7 +386,7 @@ public final class SelMahumSquad extends AbstractNpcAI cancelQuestTimer("chef_set_invul", npc, null); npc.getVariables().remove("BUSY_STATE"); npc.getVariables().remove("INVUL_REMOVE_TIMER_STARTED"); - npc.setIsRunning(false); + npc.setWalking(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java index f9a9f5b946..aca7158334 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java @@ -74,7 +74,7 @@ public final class BoyAndGirl extends AbstractNpcAI { startQuestTimer("NPC_CHANGEWEAP", 15000 + (getRandom(5) * 1000), npc, null); startQuestTimer("NPC_SHOUT", 10000 + (getRandom(5) * 1000), npc, null); - npc.setIsRunning(true); + npc.setRunning(); final Location randomLoc = Util.getRandomPosition(npc.getSpawn().getLocation(), 200, 600); addMoveToDesire(npc, GeoEngine.getInstance().canMoveToTargetLoc(npc.getLocation().getX(), npc.getLocation().getY(), npc.getLocation().getZ(), randomLoc.getX(), randomLoc.getY(), randomLoc.getZ(), npc.getInstanceWorld()), 23); return super.onSpawn(npc); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anais/Anais.java index ff5cbd1f36..c7f891b037 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anais/Anais.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anais/Anais.java @@ -58,7 +58,7 @@ public final class Anais extends AbstractNpcAI { final L2Npc npc = _divineBurners.get(pot); npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); if (pot < 4) { _current = npc; @@ -92,10 +92,10 @@ public final class Anais extends AbstractNpcAI final L2Npc b = _divineBurners.get(_pot); _pot = _pot + 1; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); final L2Npc ward = addSpawn(GRAIL_WARD, new Location(b.getX(), b.getY(), b.getZ()), true, 0); ((L2Attackable) ward).addDamageHate(_nextTarget, 0, 999); - ward.setIsRunning(true); + ward.setRunning(); ward.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _nextTarget, null); startQuestTimer("GUARD_ATTACK", 1000, ward, _nextTarget, true); startQuestTimer("SUICIDE", 20000, ward, null); @@ -127,7 +127,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } npc.doDie(null); @@ -175,7 +175,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a70e0d4d26..cca025f7bd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -358,7 +358,7 @@ public final class Baium extends AbstractNpcAI { mob.clearAggroList(); } - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(_baium, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _baium); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index bb3269b53a..51b3c7f53a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -153,7 +153,7 @@ public final class BalokWarzone extends AbstractInstance L2Npc minion = minionList.get(Rnd.get(minionList.size())); if (minion != null) { - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setCanReturnToSpawnPoint(false); currentMinion = minion; getTimers().addTimer("stage_last_minion_walk", 2000, minion, player); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java index 6d4860e00b..77d7907440 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastle/IceQueensCastle.java @@ -75,7 +75,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((mob.getId() == ARCHERY_KNIGHT) && !mob.isDead() && !mob.isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob); ((L2Attackable) npc).addDamageHate(mob, 0, 999999); } @@ -151,7 +151,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((mob.getId() == ARCHERY_KNIGHT) && !mob.isDead() && !mob.isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob); ((L2Attackable) npc).addDamageHate(mob, 0, 999999); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 92b19efcf5..351d4b0ea5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -382,7 +382,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (npc.getVariables().getInt("FREYA_MOVE") == 0) { controller.getVariables().set("FREYA_MOVE", 1); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } break; @@ -431,14 +431,14 @@ public final class IceQueensCastleBattle extends AbstractInstance manageScreenMsg(world, NpcStringId.BEGIN_STAGE_4); final FriendlyNpcInstance jinia = (FriendlyNpcInstance) addSpawn(SUPP_JINIA, SUPP_JINIA_SPAWN, false, 0, true, world.getId()); - jinia.setIsRunning(true); + jinia.setRunning(); jinia.setIsInvul(true); jinia.setCanReturnToSpawnPoint(false); jinia.reduceCurrentHp(1, freya, null); // TODO: Find better way for attack freya.reduceCurrentHp(1, jinia, null); final FriendlyNpcInstance kegor = (FriendlyNpcInstance) addSpawn(SUPP_KEGOR, SUPP_KEGOR_SPAWN, false, 0, true, world.getId()); - kegor.setIsRunning(true); + kegor.setRunning(); kegor.setIsInvul(true); kegor.setCanReturnToSpawnPoint(false); kegor.reduceCurrentHp(1, freya, null); // TODO: Find better way for attack @@ -673,7 +673,7 @@ public final class IceQueensCastleBattle extends AbstractInstance for (int i = 0; i < 3; i++) { final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), true, 0, false, world.getId()); - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(mob.getMostHated(), 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob.getMostHated()); startQuestTimer("BLIZZARD", 20000, breath, null); @@ -751,7 +751,7 @@ public final class IceQueensCastleBattle extends AbstractInstance { controller.getVariables().set("FREYA_MOVE", 1); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -825,7 +825,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (controller.getVariables().getInt("FREYA_MOVE") == 0) { controller.getVariables().set("FREYA_MOVE", 1); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1042,7 +1042,7 @@ public final class IceQueensCastleBattle extends AbstractInstance final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), false, 0, false, world.getId()); if (player != null) { - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(player, 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } @@ -1116,7 +1116,7 @@ public final class IceQueensCastleBattle extends AbstractInstance manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); final L2Npc freya = params.getObject("freya", L2Npc.class); - freya.setIsRunning(true); + freya.setRunning(); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1173,7 +1173,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (target != null) { ((L2Attackable) mob).addDamageHate(target, 0, 999); - mob.setIsRunning(true); + mob.setRunning(); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } else diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a19a9f836b..b7a53df3d6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -201,14 +201,14 @@ public class Kelbim extends AbstractNpcAI for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) { L2Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) { L2Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 51ee3bad82..ff290b7fab 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -103,7 +103,7 @@ public final class KimerianCommon extends AbstractInstance } else if (!npc.isAttackingNow() && (distance > 250)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23); } else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) @@ -270,7 +270,7 @@ public final class KimerianCommon extends AbstractInstance getTimers().addTimer("KIMERIAN_CHAT_1", 5000, t -> kimerian.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_COME_BACK_ALIVE_WITH_ROTTING_AURA)); getTimers().addTimer("KIMERIAN_RUN", 6000, t -> { - kimerian.setIsRunning(true); + kimerian.setRunning(); addMoveToDesire(kimerian, loc, 23); kimerian.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.HA_HA_HA_HA); }); @@ -309,7 +309,7 @@ public final class KimerianCommon extends AbstractInstance case NEOMI_KASHERON: { npc.initSeenCreatures(); - npc.setIsRunning(true); + npc.setRunning(); break; } case INVISIBLE_NPC: diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java index d9bf024d24..91c2ed7533 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Vortex.java @@ -140,14 +140,14 @@ public class Vortex extends AbstractNpcAI { attackRandomTarget(npc); npc.setRandomWalking(true); - npc.setIsRunning(true); + npc.setRunning(); break; } case BIG_VORTEX: { attackRandomTarget(npc); npc.setRandomWalking(true); - npc.setIsRunning(true); + npc.setRunning(); break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index c6f024c42c..94a080c937 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -187,7 +187,7 @@ public final class OctavisWarzone extends AbstractInstance ((L2Attackable) beasts).setCanReturnToSpawnPoint(false); final L2Npc octavis = addSpawn((!isExtremeMode(world) ? OCTAVIS_STAGE_1[0] : OCTAVIS_STAGE_1[1]), OCTAVIS_SPAWN_LOC, false, 0, false, world.getId()); octavis.disableCoreAI(true); - octavis.setIsRunning(true); + octavis.setRunning(); octavis.sendChannelingEffect(beasts, 1); octavis.setTargetable(false); ((L2Attackable) octavis).setCanReturnToSpawnPoint(false); @@ -286,7 +286,7 @@ public final class OctavisWarzone extends AbstractInstance if ((moveX != 0) && (moveY != 0)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, new Location(moveX, moveY, -10008), 23); } break; @@ -299,7 +299,7 @@ public final class OctavisWarzone extends AbstractInstance for (int i = 0; i < count; i++) { final L2Npc beast = addSpawn((!isExtremeMode(world) ? BEASTS_MINIONS[0] : BEASTS_MINIONS[1]), loc, false, 0, false, world.getId()); - beast.setIsRunning(true); + beast.setRunning(); ((L2Attackable) beast).setCanReturnToSpawnPoint(false); addMoveToDesire(beast, Util.getRandomPosition(BEASTS_RANDOM_POINT, 500, 500), 23); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index a64e79beb9..5495129f10 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -153,7 +153,7 @@ public class Ramona extends AbstractNpcAI for (int i = 0; i < 7; i++) { final L2Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], npc.getX() + getRandom(-200, 200), npc.getY() + getRandom(-200, 200), npc.getZ(), npc.getHeading(), false, 600000); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); _minions.add(minion); @@ -179,7 +179,7 @@ public class Ramona extends AbstractNpcAI for (int i = 0; i < 7; i++) { final L2Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], npc.getX() + getRandom(-200, 200), npc.getY() + getRandom(-200, 200), npc.getZ(), npc.getHeading(), false, 600000); - minion.setIsRunning(true); + minion.setRunning(); ((L2Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); _minions.add(minion); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Minigame/Minigame.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Minigame/Minigame.java index 0c5846b39c..3fbeed5ae7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Minigame/Minigame.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Minigame/Minigame.java @@ -110,14 +110,14 @@ public final class Minigame extends AbstractNpcAI if (npc.getId() == BURNER) { npc.setDisplayEffect(2); - npc.setIsRunning(false); + npc.setWalking(); } else { for (L2Npc burner : room.getBurners()) { burner.setDisplayEffect(2); - burner.setIsRunning(false); + burner.setWalking(); } } break; @@ -145,7 +145,7 @@ public final class Minigame extends AbstractNpcAI { final L2Npc b = room.getBurners()[room.getOrder()[room.getCurrentPot()]]; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); startQuestTimer("off", 2000, b, null); // Stopping burning each pot 2s after startQuestTimer("timer", TIMER_INTERVAL * 1000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); @@ -276,7 +276,7 @@ public final class Minigame extends AbstractNpcAI if (room.getCurrentPot() < 8) { npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); startQuestTimer("off", 2000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); } @@ -419,7 +419,7 @@ public final class Minigame extends AbstractNpcAI for (L2Npc burner : _burners) { burner.setDisplayEffect(1); - burner.setIsRunning(false); + burner.setWalking(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 193f623abd..ae4549f39f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -186,7 +186,7 @@ public final class SummonNpc extends AbstractEffect { npc.scheduleDespawn(_despawnDelay); } - npc.setIsRunning(false); // TODO: Fix broadcast info. + npc.setWalking(); // TODO: Fix broadcast info. } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/RunWalk.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/RunWalk.java index 0d5d0d9384..c5fa6aa3f1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/RunWalk.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/RunWalk.java @@ -22,13 +22,20 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; /** * Run/Walk player action handler. - * @author UnAfraid + * @author Mobius */ public final class RunWalk implements IPlayerActionHandler { @Override public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed) { - activeChar.setIsRunning(!activeChar.isRunning()); + if (activeChar.isRunning()) + { + activeChar.setWalking(); + } + else + { + activeChar.setRunning(); + } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java index 83cd0ac7d3..c0c1bba266 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java @@ -226,7 +226,7 @@ public final class ChamberOfProphecies extends AbstractInstance case "ATTACK1": case "ATTACK2": { - npc.setIsRunning(true); + npc.setRunning(); ((L2Attackable) npc).setCanReturnToSpawnPoint(false); ((L2Attackable) npc).setCanStopAttackByTime(false); if (npc.isScriptValue(0) && world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index d499d74b31..fe268f6cd0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -119,7 +119,7 @@ public final class KartiaHelperAdolph extends AbstractNpcAI if (!npc.isInsideRadius(loc, 50, true, true)) { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index 031dddadc4..374348ece8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -88,7 +88,7 @@ public final class KartiaHelperBarton extends AbstractNpcAI } else { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e58c7fa851..a667ca8510 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -227,7 +227,7 @@ public final class KartiaHelperElise extends AbstractNpcAI } else { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, loc, 23); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 1c08fce80a..b633afc228 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -284,7 +284,7 @@ public final class KartiasLabyrinth extends AbstractInstance { final Location loc = instance.getTemplateParameters().getLocation("middlePointRoom1"); final Location moveTo = new Location(loc.getX() + getRandom(-100, 100), loc.getY() + getRandom(-100, 100), loc.getZ()); - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, moveTo, 6); getTimers().addTimer("START_MOVE", 15000, npc, null); } @@ -292,7 +292,7 @@ public final class KartiasLabyrinth extends AbstractInstance { final Location loc = instance.getTemplateParameters().getLocation("middlePointRoom3"); final Location moveTo = new Location(loc.getX() + getRandom(-200, 200), loc.getY() + getRandom(-200, 200), loc.getZ()); - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, moveTo, 23); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index eb38111778..2d3a9d525d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -444,7 +444,7 @@ public final class LabyrinthOfBelis extends AbstractInstance public String onSpawn(L2Npc npc) { final L2Attackable officer = (L2Attackable) npc; - officer.setIsRunning(true); + officer.setRunning(); officer.setCanReturnToSpawnPoint(false); getTimers().addRepeatingTimer("MESSAGE", 6000, npc, null); return super.onSpawn(npc); @@ -498,7 +498,7 @@ public final class LabyrinthOfBelis extends AbstractInstance showOnScreenMsg(player, (getRandomBoolean() ? NpcStringId.IF_TERAIN_DIES_THE_MISSION_WILL_FAIL : NpcStringId.BEHIND_YOU_THE_ENEMY_IS_AMBUSHING_YOU), ExShowScreenMessage.TOP_CENTER, 4500); final L2Attackable mob = (L2Attackable) addSpawn((getRandomBoolean() ? OPERATIVE : HANDYMAN), SPAWN_ATTACKERS, false, 0, true, world.getId()); - mob.setIsRunning(true); + mob.setRunning(); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, ATTACKER_SPOT); mob.broadcastSay(ChatType.NPC_GENERAL, (getRandomBoolean() ? NpcStringId.KILL_THE_GUY_MESSING_WITH_THE_ELECTRIC_DEVICE : NpcStringId.FOCUS_ON_ATTACKING_THE_GUY_IN_THE_ROOM)); mob.addDamageHate(npc, 0, 9999); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 2f7ac24bd1..6e22603a10 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -283,7 +283,7 @@ public final class MemoryOfDisaster extends AbstractInstance case "AWAKENING_GUIDE": { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, AWAKENING_GUIDE_MOVE_1); - npc.setIsRunning(true); + npc.setRunning(); break; } default: @@ -323,13 +323,13 @@ public final class MemoryOfDisaster extends AbstractInstance } case WIRPHY: { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, WIRPHY_MOVE, 23); break; } case SILVERA: { - npc.setIsRunning(true); + npc.setRunning(); addMoveToDesire(npc, SILVERA_MOVE, 23); break; } @@ -470,7 +470,7 @@ public final class MemoryOfDisaster extends AbstractInstance player.getInstanceWorld().spawnGroup("ROGIN").forEach(n -> { addMoveToDesire(n, ROGIN_MOVE, 23); - n.setIsRunning(true); + n.setRunning(); }); break; } @@ -583,7 +583,7 @@ public final class MemoryOfDisaster extends AbstractInstance { npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { - n.setIsRunning(true); + n.setRunning(); n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); @@ -915,7 +915,7 @@ public final class MemoryOfDisaster extends AbstractInstance { if (skill.getId() == SIEGE_GOLEM_SKILL_1.getSkillId()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().moveTo(GOLEM_MOVE); } break; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java index af8d5a5b97..c1e5238e74 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java @@ -84,7 +84,7 @@ public final class MithrilMine extends AbstractInstance for (L2Npc n : npcs) { n.setScriptValue(1); - n.setIsRunning(true); + n.setRunning(); n.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, npc); ((L2Attackable) n).addDamageHate(npc, 0, 999999); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index 900b51ba44..6a72aa4c64 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -94,7 +94,7 @@ public final class MuseumDungeon extends AbstractInstance desk.getVariables().set("book", true); // Set Toyron - toyron.setIsRunning(true); + toyron.setRunning(); toyron.setCanReturnToSpawnPoint(false); } @@ -120,7 +120,7 @@ public final class MuseumDungeon extends AbstractInstance if (instance.getNpcs(THIEF).isEmpty()) { - instance.spawnGroup("thiefs").forEach(npc -> npc.setIsRunning(true)); + instance.spawnGroup("thiefs").forEach(npc -> npc.setRunning()); } } } @@ -172,14 +172,14 @@ public final class MuseumDungeon extends AbstractInstance case "TOYRON_FOLLOW": { toyron.getAI().startFollow(player); - toyron.setIsRunning(true); + toyron.setRunning(); break; } case "SPAWN_THIEFS_STAGE_1": { instance.spawnGroup("thiefs").forEach(thief -> { - thief.setIsRunning(true); + thief.setRunning(); addAttackPlayerDesire(thief, player); thief.broadcastSay(ChatType.NPC_GENERAL, THIEF_SHOUT[getRandom(2)]); }); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java index f2affd49bf..8f3d025600 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -352,7 +352,7 @@ public final class Nursery extends AbstractInstance if (getRandom(100) < 4) { final L2Npc maguen = addSpawn(MAGUEN, npc, false, 0, false, instance.getId()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().startFollow(killer); showOnScreenMsg(instance, NpcStringId.MAGUEN_APPEARANCE, ExShowScreenMessage.MIDDLE_CENTER, 4000); getTimers().addTimer("MAGUEN_WAIT_TIMER", 4000, maguen, killer); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java index 2e91b4c520..5fbcd08676 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java @@ -184,7 +184,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance { npc.disableCoreAI(true); npc.setScriptValue(1); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, LEMATAN_PORT_POINT); } break; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java index edce534b9e..646d5622be 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java @@ -87,7 +87,7 @@ public final class SSQLibraryOfSages extends AbstractInstance } case "FOLLOW": { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); npc.broadcastSay(ChatType.NPC_GENERAL, ELCADIA_DIALOGS[getRandom(ELCADIA_DIALOGS.length)]); startQuestTimer("FOLLOW", 10000, npc, player); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java index fcfb319c56..a6e227675e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java @@ -194,7 +194,7 @@ public final class SSQMonasteryOfSilence extends AbstractInstance { return null; } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); if (player.isInCombat()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index fb2c3e2d4f..48f101724b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -87,7 +87,7 @@ public final class TalkingIslandPast extends AbstractInstance { final L2Npc knight = addSpawn(MYSTERIOUS_DARK_KNIGHT, TI_LOC_3, false, 0, false, instance.getId()); knight.getAI().startFollow(player); - knight.setIsRunning(true); + knight.setRunning(); showOnScreenMsg(player, NpcStringId.A_MYSTERIOUS_DARK_KNIGHT_IS_HERE, ExShowScreenMessage.TOP_CENTER, 5000); getTimers().addTimer("MSG", null, 5000, null, player, n -> showOnScreenMsg(n.getPlayer(), NpcStringId.TALK_TO_THE_MYSTERIOUS_DARK_KNIGHT, ExShowScreenMessage.TOP_CENTER, 5000)); } @@ -129,7 +129,7 @@ public final class TalkingIslandPast extends AbstractInstance qs.setMemoState(2); final L2Npc knight = addSpawn(MYSTERIOUS_DARK_KNIGHT, loc, false, 0, false, instance.getId()); knight.getAI().startFollow(player); - knight.setIsRunning(true); + knight.setRunning(); showOnScreenMsg(player, NpcStringId.A_MYSTERIOUS_DARK_KNIGHT_IS_HERE, ExShowScreenMessage.TOP_CENTER, 5000); getTimers().addTimer("MSG", null, 5000, npc, player, n -> showOnScreenMsg(n.getPlayer(), NpcStringId.TALK_TO_THE_MYSTERIOUS_DARK_KNIGHT, ExShowScreenMessage.TOP_CENTER, 5000)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index 2c1af2741a..ee08afc59a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -110,7 +110,7 @@ public final class Q10742_AFurryFriend extends Quest final L2Npc ricky = addSpawn(RICKY, player, true, 120000); ricky.setSummoner(player); ricky.setTitle(player.getName()); - ricky.setIsRunning(true); + ricky.setRunning(); ricky.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); startQuestTimer("CHECK_RICKY_DISTANCE", 2500, ricky, player); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 1da1b21546..4fd0b4e8b5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -676,7 +676,10 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable // Set the AI Intention to AI_INTENTION_ACTIVE setIntention(AI_INTENTION_ACTIVE); - npc.setWalking(); + if (!_actor.isFakePlayer()) + { + npc.setWalking(); + } return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index 7eb1fba95c..31b5b6bb8a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -825,7 +825,7 @@ public class L2CharacterAI extends AbstractAI // Kill the actor client side by sending Server->Client packet AutoAttackStop, StopMove/StopRotation, Die (broadcast) clientNotifyDead(); - if (!_actor.isPlayable()) + if (!_actor.isPlayable() && !_actor.isFakePlayer()) { _actor.setWalking(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java index 3da5ea144c..b56e5922f7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java @@ -299,7 +299,14 @@ public final class WalkingManager implements IGameXmlReader } npc.sendDebugMessage("Starting to move at route '" + routeName + "'"); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setWalkCheckTask(ThreadPoolManager.scheduleAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight @@ -332,7 +339,14 @@ public final class WalkingManager implements IGameXmlReader walk.setBlocked(true); final L2NpcWalkerNode node = walk.getCurrentNode(); npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId()); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setBlocked(false); walk.setStoppedByAttack(false); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index ddc1a1b8d4..e9b8952567 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -768,7 +768,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } return; } @@ -786,7 +789,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } } @@ -1407,14 +1413,16 @@ public class L2Attackable extends L2Npc setScriptValue(0); // remove pvp flag setRunning(); // don't walk } + else + { + setWalking(); + } // Clear mod Seeded stat _seeded = false; _seed = null; _seederObjId = 0; - setWalking(); - // check the region where this mob is, do not activate the AI if region is inactive. // if (!isInActiveRegion()) // { @@ -1745,7 +1753,10 @@ public class L2Attackable extends L2Npc { ((L2AttackableAI) getAI()).setGlobalAggro(-25); } - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } clearAggroList(); } getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 6dd50e079f..c974146ecb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -2311,7 +2311,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return _isRunning; } - public final void setIsRunning(boolean value) + private final void setIsRunning(boolean value) { if (_isRunning == value) { @@ -2359,10 +2359,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance. */ public final void setRunning() { - if (!isRunning()) - { - setIsRunning(true); - } + setIsRunning(true); } public final boolean hasBlockActions() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 64b9ccdcb0..c100d063ca 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -3211,7 +3211,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { ((L2Attackable) npc).addDamageHate(target, 0, desire); } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -3222,7 +3222,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime */ protected void addAttackDesire(L2Npc npc, L2Character target) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java index 7f9045e186..fc6b521bf2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java @@ -155,7 +155,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI final L2Attackable monster = (L2Attackable) target; if ((monster.getId() == TANTA_MAGICIAN) || (monster.getId() == TANTA_SCOUT)) { - target.setIsRunning(true); + target.setRunning(); target.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(npc.getX(), npc.getY(), npc.getZ(), 0)); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java index 607082f858..04cada182a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java @@ -142,7 +142,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -156,7 +156,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -167,7 +167,7 @@ public final class PrimevalIsle extends AbstractNpcAI if ((target != null)) { npc.setTarget(target); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(target, 0, 555); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -297,7 +297,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.setTarget(creature); npc.doCast(CREW_SKILL.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature); } return super.onSeeCreature(npc, creature, isSummon); @@ -424,7 +424,7 @@ public final class PrimevalIsle extends AbstractNpcAI { npc.getVariables().set("SELFBUFF_USED", 1); npc.doCast(selfRangeBuff1.getSkill()); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java index 616cd8d6fa..335fef037b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java @@ -250,7 +250,7 @@ public final class SelMahumDrill extends AbstractNpcAI } receiver.disableCoreAI(true); receiver.getVariables().set("BUSY_STATE", 1); - receiver.setIsRunning(true); + receiver.setRunning(); receiver.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location((receiver.getX() + getRandom(-800, 800)), (receiver.getY() + getRandom(-800, 800)), receiver.getZ(), receiver.getHeading())); startQuestTimer("reset_busy_state", 5000, receiver, null); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java index ca6d776043..2fc3d3a904 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java @@ -140,7 +140,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "fire_arrived": { // myself.i_quest0 = 1; - npc.setIsRunning(false); + npc.setWalking(); npc.setTarget(npc); if (npc.isNoRndWalk()) @@ -165,7 +165,7 @@ public final class SelMahumSquad extends AbstractNpcAI case "remove_effects": { // myself.i_quest0 = 0; - npc.setIsRunning(true); + npc.setRunning(); npc.setDisplayEffect(MAHUM_EFFECT_NONE); break; } @@ -237,7 +237,7 @@ public final class SelMahumSquad extends AbstractNpcAI if (!receiver.isNoRndWalk() && !receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && Util.contains(SQUAD_LEADERS, receiver.getId())) { receiver.setIsNoRndWalk(true); // Moving to fire - i_ai0 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); receiver.stopMove(null); @@ -272,7 +272,7 @@ public final class SelMahumSquad extends AbstractNpcAI } receiver.setIsNoRndWalk(true); // Moving to fire - i_ai0 = 1 receiver.getVariables().set("BUSY_STATE", 1); // Eating - i_ai3 = 1 - receiver.setIsRunning(true); + receiver.setRunning(); receiver.broadcastSay(ChatType.NPC_GENERAL, (getRandom(3) < 1) ? NpcStringId.LOOKS_DELICIOUS : NpcStringId.LET_S_GO_EAT); final Location loc = sender.getPointInRange(100, 200); loc.setHeading(receiver.getHeading()); @@ -379,7 +379,7 @@ public final class SelMahumSquad extends AbstractNpcAI cancelQuestTimer("chef_set_invul", npc, null); npc.getVariables().remove("BUSY_STATE"); npc.getVariables().remove("INVUL_REMOVE_TIMER_STARTED"); - npc.setIsRunning(false); + npc.setWalking(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java index dc32b7a46f..23f92c755a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java @@ -84,7 +84,7 @@ public final class TurekOrcs extends AbstractNpcAI // Say and flee npc.broadcastSay(ChatType.GENERAL, NpcStringId.getNpcStringId(getRandom(1000007, 1000027))); npc.disableCoreAI(true); // to avoid attacking behaviour, while flee - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(npc.getAIValue("fleeX"), npc.getAIValue("fleeY"), npc.getAIValue("fleeZ"))); npc.getVariables().set("state", 1); npc.getVariables().set("attacker", attacker.getObjectId()); @@ -98,7 +98,7 @@ public final class TurekOrcs extends AbstractNpcAI if (eventName.equals("WARNING") && !receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (reference != null) && (reference.getActingPlayer() != null) && !reference.getActingPlayer().isDead()) { receiver.getVariables().set("state", 3); - receiver.setIsRunning(true); + receiver.setRunning(); ((L2Attackable) receiver).addDamageHate(reference.getActingPlayer(), 0, 99999); receiver.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, reference.getActingPlayer()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Anais.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Anais.java index 8bff3655d2..3d83ecf8e1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Anais.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Anais.java @@ -58,7 +58,7 @@ public final class Anais extends AbstractNpcAI { final L2Npc npc = _divineBurners.get(pot); npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); if (pot < 4) { _current = npc; @@ -96,10 +96,10 @@ public final class Anais extends AbstractNpcAI final L2Npc b = _divineBurners.get(_pot); _pot = _pot + 1; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); final L2Npc ward = addSpawn(GRAIL_WARD, new Location(b.getX(), b.getY(), b.getZ()), true, 0); ((L2Attackable) ward).addDamageHate(_nextTarget, 0, 999); - ward.setIsRunning(true); + ward.setRunning(); ward.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _nextTarget, null); startQuestTimer("GUARD_ATTACK", 1000, ward, _nextTarget, true); startQuestTimer("SUICIDE", 20000, ward, null); @@ -131,7 +131,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } npc.doDie(null); @@ -179,7 +179,7 @@ public final class Anais extends AbstractNpcAI if (_current != null) { _current.setDisplayEffect(2); - _current.setIsRunning(false); + _current.setWalking(); _current = null; } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java index 2178405d67..58d8bdaa6c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java @@ -111,14 +111,14 @@ public final class Minigame extends AbstractNpcAI if (npc.getId() == BURNER) { npc.setDisplayEffect(2); - npc.setIsRunning(false); + npc.setWalking(); } else { for (L2Npc burner : room.getBurners()) { burner.setDisplayEffect(2); - burner.setIsRunning(false); + burner.setWalking(); } } break; @@ -146,7 +146,7 @@ public final class Minigame extends AbstractNpcAI { final L2Npc b = room.getBurners()[room.getOrder()[room.getCurrentPot()]]; b.setDisplayEffect(1); - b.setIsRunning(false); + b.setWalking(); startQuestTimer("off", 2000, b, null); // Stopping burning each pot 2s after startQuestTimer("timer", TIMER_INTERVAL * 1000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); @@ -277,7 +277,7 @@ public final class Minigame extends AbstractNpcAI if (room.getCurrentPot() < 8) { npc.setDisplayEffect(1); - npc.setIsRunning(false); + npc.setWalking(); startQuestTimer("off", 2000, npc, null); room.setCurrentPot(room.getCurrentPot() + 1); } @@ -422,7 +422,7 @@ public final class Minigame extends AbstractNpcAI for (L2Npc burner : _burners) { burner.setDisplayEffect(1); - burner.setIsRunning(false); + burner.setWalking(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java index ce5f464e7d..41c30d63a2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Maguen.java @@ -95,7 +95,7 @@ public final class Maguen extends AbstractNpcAI final L2Npc maguen = addSpawn(MAGUEN, npc.getLocation(), true, 60000, true); maguen.getVariables().set("SUMMON_PLAYER", player); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java index b1db9e7633..7a93e73d55 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java @@ -86,7 +86,7 @@ public final class Nemo extends AbstractNpcAI maguen.getVariables().set("TEST_MAGUEN", 1); player.getVariables().set("TEST_MAGUEN", 1); maguen.setTitle(player.getName()); - maguen.setIsRunning(true); + maguen.setRunning(); maguen.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); maguen.broadcastStatusUpdate(); showOnScreenMsg(player, NpcStringId.MAGUEN_APPEARANCE, 2, 4000); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index f45b40093e..ad496aead3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -173,7 +173,7 @@ public final class SummonNpc extends AbstractEffect { npc.scheduleDespawn(_despawnDelay); } - npc.setIsRunning(false); // TODO: Fix broadcast info. + npc.setWalking(); // TODO: Fix broadcast info. } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java index 7a645f379e..e870316d39 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java @@ -744,7 +744,7 @@ public final class TowerOfNaia extends AbstractNpcAI else if (((npcId == SPORE_BASIC) || ((npcId >= SPORE_FIRE) && (npcId <= SPORE_EARTH))) && (_challengeState == STATE_SPORE_CHALLENGE_IN_PROGRESS)) { _sporeSpawn.add(npc); - npc.setIsRunning(false); + npc.setWalking(); final int[] coord = SPORES_MOVE_POINTS[getRandom(SPORES_MOVE_POINTS.length)]; npc.getSpawn().setX(coord[0]); npc.getSpawn().setY(coord[1]); @@ -833,7 +833,7 @@ public final class TowerOfNaia extends AbstractNpcAI final double distance = npc.calculateDistance(coords[0], coords[1], coords[2], true, false); final int heading = Util.calculateHeadingFrom(npc.getX(), npc.getY(), coords[0], coords[1]); time = (int) ((distance / npc.getWalkSpeed()) * 1000); - npc.setIsRunning(false); + npc.setWalking(); npc.disableCoreAI(true); npc.setIsNoRndWalk(true); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(coords[0], coords[1], coords[2], heading)); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java index af469a79ef..8f0d3c9580 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java @@ -84,7 +84,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((character.getId() == ARCHERY_KNIGHT) && !character.isDead() && !((L2Attackable) character).isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, character); ((L2Attackable) npc).addDamageHate(character, 0, 999999); } @@ -145,7 +145,7 @@ public final class IceQueensCastle extends AbstractInstance { if ((character.getId() == ARCHERY_KNIGHT) && !character.isDead() && !((L2Attackable) character).isDecayed()) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, character); ((L2Attackable) npc).addDamageHate(character, 0, 999999); npc.setScriptValue(1); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java index 9c752c8bef..76af47d9f8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java @@ -408,7 +408,7 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance if (npc.getVariables().getInt("FREYA_MOVE") == 0) { world.controller.getVariables().set("FREYA_MOVE", 1); - world.freya.setIsRunning(true); + world.freya.setRunning(); world.freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } break; @@ -458,13 +458,13 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance world.freya.disableCoreAI(false); manageScreenMsg(world, NpcStringId.BEGIN_STAGE_4); world.supp_Jinia = (L2QuestGuardInstance) addSpawn(SUPP_JINIA, SUPP_JINIA_SPAWN, false, 0, true, world.getInstanceId()); - world.supp_Jinia.setIsRunning(true); + world.supp_Jinia.setRunning(); world.supp_Jinia.setIsInvul(true); world.supp_Jinia.setCanReturnToSpawnPoint(false); world.supp_Jinia.reduceCurrentHp(1, world.freya, null); // TODO: Find better way for attack world.freya.reduceCurrentHp(1, world.supp_Jinia, null); world.supp_Kegor = (L2QuestGuardInstance) addSpawn(SUPP_KEGOR, SUPP_KEGOR_SPAWN, false, 0, true, world.getInstanceId()); - world.supp_Kegor.setIsRunning(true); + world.supp_Kegor.setRunning(); world.supp_Kegor.setIsInvul(true); world.supp_Kegor.setCanReturnToSpawnPoint(false); world.supp_Kegor.reduceCurrentHp(1, world.freya, null); // TODO: Find better way for attack @@ -707,7 +707,7 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance for (int i = 0; i < 3; i++) { final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), true, 0, false, world.getInstanceId()); - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(mob.getMostHated(), 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, mob.getMostHated()); startQuestTimer("BLIZZARD", 20000, breath, null); @@ -795,7 +795,7 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance { world.controller.getVariables().set("FREYA_MOVE", 1); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); - world.freya.setIsRunning(true); + world.freya.setRunning(); world.freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -873,7 +873,7 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance if (world.controller.getVariables().getInt("FREYA_MOVE") == 0) { world.controller.getVariables().set("FREYA_MOVE", 1); - world.freya.setIsRunning(true); + world.freya.setRunning(); world.freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1099,7 +1099,7 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance final L2Attackable breath = (L2Attackable) addSpawn(BREATH, npc.getLocation(), false, 0, false, world.getInstanceId()); if (player != null) { - breath.setIsRunning(true); + breath.setRunning(); breath.addDamageHate(player, 0, 999); breath.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } @@ -1172,7 +1172,7 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance { var.set("FREYA_MOVE", 1); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); - world.freya.setIsRunning(true); + world.freya.setRunning(); world.freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } @@ -1346,7 +1346,7 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance if (target != null) { mob.addDamageHate(target, 0, 999); - mob.setIsRunning(true); + mob.setRunning(); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java index 37d0f983e1..42482e4c32 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java @@ -94,7 +94,7 @@ public final class LibraryOfSages extends AbstractInstance } case "FOLLOW": { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); npc.broadcastSay(ChatType.NPC_GENERAL, ELCADIA_DIALOGS[getRandom(ELCADIA_DIALOGS.length)]); startQuestTimer("FOLLOW", 10000, npc, player); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java index 530cef85fa..a77f33f267 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java @@ -100,7 +100,7 @@ public final class MithrilMine extends AbstractInstance { final L2Attackable spawnedMob = (L2Attackable) addSpawn(MITHRIL_MILLIPEDE, loc, false, 0, false, world.getInstanceId()); spawnedMob.setScriptValue(1); - spawnedMob.setIsRunning(true); + spawnedMob.setRunning(); spawnedMob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, npc); spawnedMob.addDamageHate(npc, 0, 999999); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java index 8b01ddd5ab..58df1aace9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java @@ -270,7 +270,7 @@ public final class MonasteryOfSilence1 extends AbstractInstance } case "FOLLOW": { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().startFollow(player); if (player.isInCombat()) { @@ -398,7 +398,7 @@ public final class MonasteryOfSilence1 extends AbstractInstance for (Location LOC : SLAVE_SPAWN_1_LOC) { L2Attackable mob = (L2Attackable) addSpawn(TRAINEE_OF_REST, LOC, false, 0, false, world.getInstanceId()); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(player, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } @@ -408,7 +408,7 @@ public final class MonasteryOfSilence1 extends AbstractInstance for (Location LOC : SLAVE_SPAWN_2_LOC) { L2Attackable mob = (L2Attackable) addSpawn(TRAINEE_OF_REST, LOC, false, 0, false, world.getInstanceId()); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(player, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } @@ -418,7 +418,7 @@ public final class MonasteryOfSilence1 extends AbstractInstance for (Location LOC : SLAVE_SPAWN_3_LOC) { L2Attackable mob = (L2Attackable) addSpawn(SUPPLICANT_OF_REST, LOC, false, 0, false, world.getInstanceId()); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(player, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } @@ -428,7 +428,7 @@ public final class MonasteryOfSilence1 extends AbstractInstance for (Location LOC : SLAVE_SPAWN_4_LOC) { L2Attackable mob = (L2Attackable) addSpawn(SUPPLICANT_OF_REST, LOC, false, 0, false, world.getInstanceId()); - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(player, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java index 31bd2d4103..9cefbc3264 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java @@ -207,7 +207,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance { npc.disableCoreAI(true); npc.setScriptValue(1); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, LEMATAN_PORT_POINT); } break; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java index f6e59c5731..e39c8be705 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java @@ -737,7 +737,7 @@ public final class Q00065_CertifiedSoulBreaker extends Quest { startQuestTimer("DESPAWN_5", 5000, npc, null); npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.DRATS_HOW_COULD_I_BE_SO_WRONG)); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MOVE_TO); } else if (npc.getId() == GUARDIAN_ANGEL) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java index d8466fbee5..ea4675a6b6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java @@ -683,7 +683,7 @@ public final class Q00227_TestOfTheReformer extends Quest case OL_MAHUM_BETRAYER: { startQuestTimer("DESPAWN", 5000, npc, null, true); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MOVE_TO); npc.getVariables().set("SPAWNED", 0); break; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java index f9a74d77f0..5ef49c1880 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java @@ -269,7 +269,14 @@ public final class WalkingManager implements IXmlReader } npc.sendDebugMessage("Starting to move at route '" + routeName + "'"); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setWalkCheckTask(ThreadPoolManager.scheduleAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight @@ -302,7 +309,14 @@ public final class WalkingManager implements IXmlReader walk.setBlocked(true); final L2NpcWalkerNode node = walk.getCurrentNode(); npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId()); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setBlocked(false); walk.setStoppedByAttack(false); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index e0c74bc711..7fda07d622 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -2875,7 +2875,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return _isRunning; } - public final void setIsRunning(boolean value) + private final void setIsRunning(boolean value) { if (_isRunning == value) { @@ -2919,10 +2919,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance. */ public final void setRunning() { - if (!isRunning()) - { - setIsRunning(true); - } + setIsRunning(true); } public final boolean isSleeping() @@ -3088,10 +3085,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final void setWalking() { - if (isRunning()) - { - setIsRunning(false); - } + setIsRunning(false); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 20ab850995..e64b758655 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2780,7 +2780,7 @@ public abstract class AbstractScript extends ManagedScript { ((L2Attackable) npc).addDamageHate(target, 0, desire); } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a70e0d4d26..cca025f7bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -358,7 +358,7 @@ public final class Baium extends AbstractNpcAI { mob.clearAggroList(); } - mob.setIsRunning(true); + mob.setRunning(); mob.addDamageHate(_baium, 0, 999); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, _baium); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 193f623abd..ae4549f39f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -186,7 +186,7 @@ public final class SummonNpc extends AbstractEffect { npc.scheduleDespawn(_despawnDelay); } - npc.setIsRunning(false); // TODO: Fix broadcast info. + npc.setWalking(); // TODO: Fix broadcast info. } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/RunWalk.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/RunWalk.java index 0d5d0d9384..c5fa6aa3f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/RunWalk.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/RunWalk.java @@ -22,13 +22,20 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; /** * Run/Walk player action handler. - * @author UnAfraid + * @author Mobius */ public final class RunWalk implements IPlayerActionHandler { @Override public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed) { - activeChar.setIsRunning(!activeChar.isRunning()); + if (activeChar.isRunning()) + { + activeChar.setWalking(); + } + else + { + activeChar.setRunning(); + } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java index 4f0a1824cb..9a8611284d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java @@ -683,7 +683,7 @@ public final class Q00227_TestOfTheReformer extends Quest case OL_MAHUM_BETRAYER: { startQuestTimer("DESPAWN", 5000, npc, null, true); - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MOVE_TO); npc.getVariables().set("SPAWNED", 0); break; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 1da1b21546..4fd0b4e8b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -676,7 +676,10 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable // Set the AI Intention to AI_INTENTION_ACTIVE setIntention(AI_INTENTION_ACTIVE); - npc.setWalking(); + if (!_actor.isFakePlayer()) + { + npc.setWalking(); + } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index 7eb1fba95c..31b5b6bb8a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -825,7 +825,7 @@ public class L2CharacterAI extends AbstractAI // Kill the actor client side by sending Server->Client packet AutoAttackStop, StopMove/StopRotation, Die (broadcast) clientNotifyDead(); - if (!_actor.isPlayable()) + if (!_actor.isPlayable() && !_actor.isFakePlayer()) { _actor.setWalking(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java index 3da5ea144c..b56e5922f7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java @@ -299,7 +299,14 @@ public final class WalkingManager implements IGameXmlReader } npc.sendDebugMessage("Starting to move at route '" + routeName + "'"); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setWalkCheckTask(ThreadPoolManager.scheduleAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight @@ -332,7 +339,14 @@ public final class WalkingManager implements IGameXmlReader walk.setBlocked(true); final L2NpcWalkerNode node = walk.getCurrentNode(); npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId()); - npc.setIsRunning(node.runToLocation()); + if (node.runToLocation()) + { + npc.setRunning(); + } + else + { + npc.setWalking(); + } npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); walk.setBlocked(false); walk.setStoppedByAttack(false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index c3f0de92ff..4a547bd1e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -768,7 +768,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } return; } @@ -786,7 +789,10 @@ public class L2Attackable extends L2Npc ((L2AttackableAI) getAI()).setGlobalAggro(-25); clearAggroList(); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } } } @@ -1407,14 +1413,16 @@ public class L2Attackable extends L2Npc setScriptValue(0); // remove pvp flag setRunning(); // don't walk } + else + { + setWalking(); + } // Clear mod Seeded stat _seeded = false; _seed = null; _seederObjId = 0; - setWalking(); - // check the region where this mob is, do not activate the AI if region is inactive. // if (!isInActiveRegion()) // { @@ -1745,7 +1753,10 @@ public class L2Attackable extends L2Npc { ((L2AttackableAI) getAI()).setGlobalAggro(-25); } - setWalking(); + if (!isFakePlayer()) + { + setWalking(); + } clearAggroList(); } getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 6dd50e079f..c974146ecb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -2311,7 +2311,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return _isRunning; } - public final void setIsRunning(boolean value) + private final void setIsRunning(boolean value) { if (_isRunning == value) { @@ -2359,10 +2359,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance. */ public final void setRunning() { - if (!isRunning()) - { - setIsRunning(true); - } + setIsRunning(true); } public final boolean hasBlockActions() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index d62c0be382..e7e77b497a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -3199,7 +3199,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime { ((L2Attackable) npc).addDamageHate(target, 0, desire); } - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); } @@ -3210,7 +3210,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime */ protected void addAttackDesire(L2Npc npc, L2Character target) { - npc.setIsRunning(true); + npc.setRunning(); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); }