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

Disabler locker throwing (#4683)

Browse Source
This commit is contained in:
metalgearsloth
2021-09-24 08:44:25 +10:00
committed by GitHub
parent 5add2f1f80
commit 2145124aa4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ using Content.Shared.Notification.Managers;
using Content.Shared.Physics.Pull; using Content.Shared.Physics.Pull;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Input.Binding; using Robust.Shared.Input.Binding;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -227,13 +228,12 @@ namespace Content.Server.Hands.Systems
var playerEnt = playerSession.AttachedEntity; var playerEnt = playerSession.AttachedEntity;
if (playerEnt == null || !playerEnt.IsValid() || !playerEnt.TryGetComponent(out SharedHandsComponent? hands)) if (playerEnt == null ||
return false; !playerEnt.IsValid() ||
playerEnt.IsInContainer() ||
if (!hands.TryGetActiveHeldEntity(out var throwEnt)) !playerEnt.TryGetComponent(out SharedHandsComponent? hands) ||
return false; !hands.TryGetActiveHeldEntity(out var throwEnt) ||
!_interactionSystem.TryThrowInteraction(hands.Owner, throwEnt))
if (!_interactionSystem.TryThrowInteraction(hands.Owner, throwEnt))
return false; return false;
if (throwEnt.TryGetComponent(out StackComponent? stack) && stack.Count > 1 && stack.ThrowIndividually) if (throwEnt.TryGetComponent(out StackComponent? stack) && stack.Count > 1 && stack.ThrowIndividually)