From 92015c1a13889712d7061baadf3edbbd5c5f4362 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Mon, 15 May 2023 19:01:43 -0500 Subject: [PATCH] guards no longer ignore early exit. FSM will not run if no players are online. mobs will use translocate instead of recall power. --- src/engine/ai/MobileFSM.java | 10 ++++------ src/engine/ai/MobileFSMManager.java | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/engine/ai/MobileFSM.java b/src/engine/ai/MobileFSM.java index 7b9ad4e9..69846d01 100644 --- a/src/engine/ai/MobileFSM.java +++ b/src/engine/ai/MobileFSM.java @@ -331,7 +331,7 @@ public class MobileFSM { CheckForRespawn(mob); return; } - if (mob.playerAgroMap.isEmpty() && mob.isPlayerGuard == false) + if (mob.playerAgroMap.isEmpty()) //no players loaded, no need to proceed return; if (mob.isCombat() && mob.getCombatTarget() == null) { @@ -492,21 +492,19 @@ public class MobileFSM { if (mob.isPlayerGuard() && !mob.despawned) { City current = ZoneManager.getCityAtLocation(mob.getLoc()); if (current == null || current.equals(mob.getGuild().getOwnedCity()) == false || mob.playerAgroMap.isEmpty()) { - PowersBase recall = PowersManager.getPowerByToken(-1994153779); - PowersManager.useMobPower(mob, mob, recall, 40); + MovementManager.translocate(mob,mob.getBindLoc(),null); mob.setCombatTarget(null); if(mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal() && mob.isAlive()){ //guard captain pulls his minions home with him for (Entry minion : mob.siegeMinionMap.entrySet()) { - PowersManager.useMobPower(minion.getKey(), minion.getKey(), recall, 40); + MovementManager.translocate(minion.getKey(),mob.getBindLoc(),null); minion.getKey().setCombatTarget(null); } } } } else if(MovementUtilities.inRangeOfBindLocation(mob) == false) { - PowersBase recall = PowersManager.getPowerByToken(-1994153779); - PowersManager.useMobPower(mob, mob, recall, 40); + MovementManager.translocate(mob,mob.getBindLoc(),null); mob.setCombatTarget(null); } } diff --git a/src/engine/ai/MobileFSMManager.java b/src/engine/ai/MobileFSMManager.java index f8b0fd52..3073e877 100644 --- a/src/engine/ai/MobileFSMManager.java +++ b/src/engine/ai/MobileFSMManager.java @@ -8,6 +8,7 @@ package engine.ai; +import engine.gameManager.SessionManager; import engine.gameManager.ZoneManager; import engine.objects.Mob; import engine.objects.Zone; @@ -88,7 +89,7 @@ public class MobileFSMManager { for (Mob mob : zone.zoneMobSet) { try { - if (mob != null) + if (mob != null && SessionManager.getActivePlayerCharacterCount() > 0) MobileFSM.DetermineAction(mob); } catch (Exception e) { Logger.error("Mob: " + mob.getName() + " UUID: " + mob.getObjectUUID() + " ERROR: " + e);