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

Fix disarm action (again) (#7435)

Browse Source
This commit is contained in:
Leon Friedrich
2022-04-06 17:41:12 +12:00
committed by GitHub
parent f583d0b96a
commit 8ac330649b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Hands/Systems/HandsSystem.cs
View File

@@ -90,7 +90,7 @@ namespace Content.Server.Hands.Systems
if (TryComp(uid, out SharedPullerComponent? puller) && puller.Pulling is EntityUid pulled && TryComp(pulled, out SharedPullableComponent? pullable)) if (TryComp(uid, out SharedPullerComponent? puller) && puller.Pulling is EntityUid pulled && TryComp(pulled, out SharedPullableComponent? pullable))
_pullingSystem.TryStopPull(pullable); _pullingSystem.TryStopPull(pullable);
if (_handsSystem.TryDrop(uid, component.ActiveHand!, null, checkActionBlocker: false)) if (!_handsSystem.TryDrop(uid, component.ActiveHand!, null, checkActionBlocker: false))
return; return;
var targetName = Name(args.Target); var targetName = Name(args.Target);