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

shield values examine (#17245)

Browse Source
This commit is contained in:
Slava0135
2023-06-17 05:07:58 +03:00
committed by GitHub
parent 99cfe77557
commit 8ed4dcf0fb
7 changed files with 172 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,10 +58,7 @@ public sealed partial class BlockingSystem
private void OnDamageModified(EntityUid uid, BlockingComponent component, DamageModifyEvent args)
{
_proto.TryIndex<DamageModifierSetPrototype>(component.PassiveBlockDamageModifer, out var passiveblockModifier);
_proto.TryIndex<DamageModifierSetPrototype>(component.ActiveBlockDamageModifier, out var activeBlockModifier);
var modifier = component.IsBlocking ? activeBlockModifier : passiveblockModifier;
var modifier = component.IsBlocking ? component.ActiveBlockDamageModifier : component.PassiveBlockDamageModifer;
if (modifier == null)
{
return;