From 4be03591b94d58d34f97ab6236760bd064f7b0f9 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Wed, 22 Nov 2023 16:43:12 -0800
Subject: [PATCH] Fix health alert not being updated when a system overrides
 the current state through UpdateMobStateEvent (#21741)

---
 .../Mobs/Systems/MobThresholdSystem.cs        | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
index f34240d8fe..59d9fb4c23 100644
--- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
+++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
@@ -22,6 +22,7 @@ public sealed class MobThresholdSystem : EntitySystem
         SubscribeLocalEvent<MobThresholdsComponent, ComponentStartup>(MobThresholdStartup);
         SubscribeLocalEvent<MobThresholdsComponent, DamageChangedEvent>(OnDamaged);
         SubscribeLocalEvent<MobThresholdsComponent, UpdateMobStateEvent>(OnUpdateMobState);
+        SubscribeLocalEvent<MobThresholdsComponent, MobStateChangedEvent>(OnThresholdsMobState);
     }
 
     private void OnGetState(EntityUid uid, MobThresholdsComponent component, ref ComponentGetState args)
@@ -424,9 +425,7 @@ public sealed class MobThresholdSystem : EntitySystem
         if (!TryComp<MobStateComponent>(target, out var mobState) || !TryComp<DamageableComponent>(target, out var damageable))
             return;
         CheckThresholds(target, mobState, thresholds, damageable);
-        var ev = new MobThresholdChecked(target, mobState, thresholds, damageable);
-        RaiseLocalEvent(target, ref ev, true);
-        UpdateAlerts(target, mobState.CurrentState, thresholds, damageable);
+        UpdateAllEffects((target, thresholds, mobState, damageable), mobState.CurrentState);
     }
 
     private void MobThresholdShutdown(EntityUid target, MobThresholdsComponent component, ComponentShutdown args)
@@ -447,6 +446,23 @@ public sealed class MobThresholdSystem : EntitySystem
         }
     }
 
+    private void UpdateAllEffects(Entity<MobThresholdsComponent, MobStateComponent?, DamageableComponent?> ent, MobState currentState)
+    {
+        var (_, thresholds, mobState, damageable) = ent;
+        if (Resolve(ent, ref thresholds, ref mobState, ref damageable))
+        {
+            var ev = new MobThresholdChecked(ent, mobState, thresholds, damageable);
+            RaiseLocalEvent(ent, ref ev, true);
+        }
+
+        UpdateAlerts(ent, currentState, thresholds, damageable);
+    }
+
+    private void OnThresholdsMobState(Entity<MobThresholdsComponent> ent, ref MobStateChangedEvent args)
+    {
+        UpdateAllEffects((ent, ent, null, null), args.NewMobState);
+    }
+
     #endregion
 }