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

Fix eshield (#624)

Browse Source
This commit is contained in:
Aviu00
2024-01-20 02:20:21 +09:00
committed by Aviu00
parent 95f7c80fe5
commit 9d84ddcd48
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Blocking/BlockingSystem.User.cs
View File

@@ -1,6 +1,5 @@
using Content.Shared.Damage; using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes; using Content.Shared.Item.ItemToggle.Components;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers; using Robust.Shared.Containers;
@@ -48,6 +47,8 @@ public sealed partial class BlockingSystem
return; return;
var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction; var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction;
if (TryComp(component.BlockingItem, out ItemToggleComponent? toggle) && !toggle.Activated) // WD
blockFraction = 0f;
blockFraction = Math.Clamp(blockFraction, 0, 1); blockFraction = Math.Clamp(blockFraction, 0, 1);
_damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage); _damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage);