Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Stop healing when target is dead (#7224)

Browse Source
This commit is contained in:
mirrorcult
2022-04-16 23:29:31 -07:00
committed by GitHub
parent 2b9349841c
commit b311c9e2c9
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Medical/HealingSystem.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Damage;
using Content.Shared.Database; using Content.Shared.Database;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Events;
using Content.Shared.MobState.Components;
using Content.Shared.Stacks; using Content.Shared.Stacks;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Player; using Robust.Shared.Player;
@@ -35,6 +36,9 @@ public sealed class HealingSystem : EntitySystem
private void OnHealingComplete(EntityUid uid, DamageableComponent component, HealingCompleteEvent args) private void OnHealingComplete(EntityUid uid, DamageableComponent component, HealingCompleteEvent args)
{ {
if (TryComp<MobStateComponent>(uid, out var state) && state.IsDead())
return;
if (TryComp<StackComponent>(args.Component.Owner, out var stack) && stack.Count < 1) return; if (TryComp<StackComponent>(args.Component.Owner, out var stack) && stack.Count < 1) return;
if (component.DamageContainerID is not null && if (component.DamageContainerID is not null &&
@@ -95,6 +99,9 @@ public sealed class HealingSystem : EntitySystem
return; return;
} }
if (TryComp<MobStateComponent>(target, out var state) && state.IsDead())
return;
if (!TryComp<DamageableComponent>(target, out var targetDamage)) if (!TryComp<DamageableComponent>(target, out var targetDamage))
return; return;