ABrain.Stop: Set FSM state to IDLE.

* Fixes `/mob path` not making the target follow the path immediately. * It could result in various undesirable effects, but resetting the state makes sense to me.
OpenDAoC · Jul 11, 2024 · b63492b · b63492b
1 parent 13b6685
commit b63492b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/GameServer/ai/ABrain.cs b/GameServer/ai/ABrain.cs
@@ -50,6 +50,7 @@ public virtual bool Stop()
         {
             bool wasReturningToSpawnPoint = Body.IsReturningToSpawnPoint;
             Body.StopMoving();
+            FSM?.SetCurrentState(eFSMStateType.IDLE);
 
             // Without `IsActive` check, charming a NPC that's returning to spawn would teleport it.
             if (wasReturningToSpawnPoint && !IsActive)

diff --git a/GameServer/ai/brain/Animist/TurretBrain.cs b/GameServer/ai/brain/Animist/TurretBrain.cs
@@ -138,9 +138,11 @@ protected virtual bool TrustCast(Spell spell, eCheckSpellType type, GameLiving t
 
         public override bool Stop()
         {
-            ClearAggroList();
+            if (!base.Stop())
+                return false;
+
             _defensiveSpellTargets.Clear();
-            return base.Stop();
+            return true;
         }
 
         #region AI

diff --git a/GameServer/ai/brain/StandardMob/StandardMobBrain.cs b/GameServer/ai/brain/StandardMob/StandardMobBrain.cs
@@ -53,13 +53,11 @@ public override string ToString()
         public override bool Stop()
         {
             // tolakram - when the brain stops, due to either death or no players in the vicinity, clear the aggro list
-            if (base.Stop())
-            {
-                ClearAggroList();
-                return true;
-            }
+            if (!base.Stop())
+                return false;
 
-            return false;
+            ClearAggroList();
+            return true;
         }
 
         public override void KillFSM()