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

Entities with hands still respect "needsHands: false" for Puller (#9266)

Browse Source
This commit is contained in:
Rane
2022-06-30 14:40:32 -04:00
committed by GitHub
parent d19f1ae67c
commit f40e13f5f4
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,6 @@ namespace Content.Server.Hands.Systems
SubscribeLocalEvent<HandsComponent, DisarmedEvent>(OnDisarmed, before: new[] { typeof(StunSystem) }); SubscribeLocalEvent<HandsComponent, DisarmedEvent>(OnDisarmed, before: new[] { typeof(StunSystem) });
SubscribeLocalEvent<HandsComponent, PullAttemptEvent>(HandlePullAttempt);
SubscribeLocalEvent<HandsComponent, PullStartedMessage>(HandlePullStarted); SubscribeLocalEvent<HandsComponent, PullStartedMessage>(HandlePullStarted);
SubscribeLocalEvent<HandsComponent, PullStoppedMessage>(HandlePullStopped); SubscribeLocalEvent<HandsComponent, PullStoppedMessage>(HandlePullStopped);
@@ -148,19 +147,12 @@ namespace Content.Server.Hands.Systems
#endregion #endregion
#region pulling #region pulling
private static void HandlePullAttempt(EntityUid uid, HandsComponent component, PullAttemptEvent args) private void HandlePullStarted(EntityUid uid, HandsComponent component, PullStartedMessage args)
{ {
if (args.Puller.Owner != uid) if (args.Puller.Owner != uid)
return; return;
// Cancel pull if all hands full. if (TryComp<SharedPullerComponent>(args.Puller.Owner, out var pullerComp) && !pullerComp.NeedsHands)
if (!component.IsAnyHandFree())
args.Cancelled = true;
}
private void HandlePullStarted(EntityUid uid, HandsComponent component, PullStartedMessage args)
{
if (args.Puller.Owner != uid)
return; return;
if (!_virtualItemSystem.TrySpawnVirtualItemInHand(args.Pulled.Owner, uid)) if (!_virtualItemSystem.TrySpawnVirtualItemInHand(args.Pulled.Owner, uid))