From fc0c8d14a3e5c583e85d9fc20ae175fe69c4153f Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Tue, 23 Aug 2022 08:00:06 -0400 Subject: [PATCH] shields no longer break from healing (#10719) --- Content.Shared/Blocking/BlockingUserSystem.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Blocking/BlockingUserSystem.cs b/Content.Shared/Blocking/BlockingUserSystem.cs index 6bfaa3bbbb..a815a5bea0 100644 --- a/Content.Shared/Blocking/BlockingUserSystem.cs +++ b/Content.Shared/Blocking/BlockingUserSystem.cs @@ -12,6 +12,7 @@ public sealed class BlockingUserSystem : EntitySystem { [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly BlockingSystem _blockingSystem = default!; + [Dependency] private readonly DamageableSystem _damageable = default!; public override void Initialize() { @@ -54,9 +55,9 @@ public sealed class BlockingUserSystem : EntitySystem private void OnDamageChanged(EntityUid uid, BlockingUserComponent component, DamageChangedEvent args) { - if (component.BlockingItem != null) + if (args.DamageDelta != null && args.DamageIncreased) { - RaiseLocalEvent(component.BlockingItem.Value, args); + _damageable.TryChangeDamage(component.BlockingItem, args.DamageDelta); } }