tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix health alert not being updated when a system overrides the current state through UpdateMobStateEvent (#21741)

Browse Source
This commit is contained in:
DrSmugleaf
2023-11-22 16:43:12 -08:00
committed by GitHub
parent 8edeb4c4ac
commit 4be03591b9
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Shared/Mobs/Systems/MobThresholdSystem.cs
View File

@@ -22,6 +22,7 @@ public sealed class MobThresholdSystem : EntitySystem
SubscribeLocalEvent<MobThresholdsComponent, ComponentStartup>(MobThresholdStartup); SubscribeLocalEvent<MobThresholdsComponent, ComponentStartup>(MobThresholdStartup);
SubscribeLocalEvent<MobThresholdsComponent, DamageChangedEvent>(OnDamaged); SubscribeLocalEvent<MobThresholdsComponent, DamageChangedEvent>(OnDamaged);
SubscribeLocalEvent<MobThresholdsComponent, UpdateMobStateEvent>(OnUpdateMobState); SubscribeLocalEvent<MobThresholdsComponent, UpdateMobStateEvent>(OnUpdateMobState);
SubscribeLocalEvent<MobThresholdsComponent, MobStateChangedEvent>(OnThresholdsMobState);
} }
private void OnGetState(EntityUid uid, MobThresholdsComponent component, ref ComponentGetState args) 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)) if (!TryComp<MobStateComponent>(target, out var mobState) || !TryComp<DamageableComponent>(target, out var damageable))
return; return;
CheckThresholds(target, mobState, thresholds, damageable); CheckThresholds(target, mobState, thresholds, damageable);
var ev = new MobThresholdChecked(target, mobState, thresholds, damageable); UpdateAllEffects((target, thresholds, mobState, damageable), mobState.CurrentState);
RaiseLocalEvent(target, ref ev, true);
UpdateAlerts(target, mobState.CurrentState, thresholds, damageable);
} }
private void MobThresholdShutdown(EntityUid target, MobThresholdsComponent component, ComponentShutdown args) 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 #endregion
} }