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

Allow pulling entities with full hands. (#5758)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-13 18:46:09 +13:00
committed by GitHub
parent 41a9bb1efa
commit 40dfc1f5ce
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,9 @@ namespace Content.Server.Hands.Systems
private static void HandlePullAttempt(EntityUid uid, HandsComponent component, PullAttemptMessage args) private static void HandlePullAttempt(EntityUid uid, HandsComponent component, PullAttemptMessage args)
{ {
if (args.Puller.Owner != uid)
return;
// Cancel pull if all hands full. // Cancel pull if all hands full.
if (component.Hands.All(hand => !hand.IsEmpty)) if (component.Hands.All(hand => !hand.IsEmpty))
args.Cancelled = true; args.Cancelled = true;
@@ -72,6 +75,9 @@ namespace Content.Server.Hands.Systems
private void HandlePullStarted(EntityUid uid, HandsComponent component, PullStartedMessage args) private void HandlePullStarted(EntityUid uid, HandsComponent component, PullStartedMessage args)
{ {
if (args.Puller.Owner != uid)
return;
if (!_virtualItemSystem.TrySpawnVirtualItemInHand(args.Pulled.Owner, uid)) if (!_virtualItemSystem.TrySpawnVirtualItemInHand(args.Pulled.Owner, uid))
{ {
DebugTools.Assert("Unable to find available hand when starting pulling??"); DebugTools.Assert("Unable to find available hand when starting pulling??");
@@ -80,6 +86,9 @@ namespace Content.Server.Hands.Systems
private void HandlePullStopped(EntityUid uid, HandsComponent component, PullStoppedMessage args) private void HandlePullStopped(EntityUid uid, HandsComponent component, PullStoppedMessage args)
{ {
if (args.Puller.Owner != uid)
return;
// Try find hand that is doing this pull. // Try find hand that is doing this pull.
// and clear it. // and clear it.
foreach (var hand in component.Hands) foreach (var hand in component.Hands)