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

Remove hands component reference (#15197)

Browse Source
This commit is contained in:
DrSmugleaf
2023-04-07 11:21:12 -07:00
committed by GitHub
parent c54ee5290b
commit b947856431
73 changed files with 277 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Content.Server/Strip/StrippableSystem.cs
View File

@@ -1,24 +1,23 @@
using System.Linq;
using Content.Server.Ensnaring;
using Content.Server.Hands.Components;
using Content.Shared.CombatMode;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction.Events;
using Content.Shared.Inventory;
using Content.Shared.Popups;
using Content.Shared.Strip.Components;
using Content.Shared.Verbs;
using Robust.Server.GameObjects;
using Content.Server.Administration.Logs;
using Content.Server.Ensnaring;
using Content.Shared.CombatMode;
using Content.Shared.Cuffs;
using Content.Shared.Cuffs.Components;
using Content.Shared.Database;
using Content.Shared.DoAfter;
using Content.Shared.Ensnaring.Components;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.Inventory;
using Content.Shared.Popups;
using Content.Shared.Strip;
using Content.Shared.Strip.Components;
using Content.Shared.Verbs;
using Robust.Server.GameObjects;
using Robust.Shared.Utility;
namespace Content.Server.Strip
@@ -89,8 +88,7 @@ namespace Content.Server.Strip
private void StripHand(EntityUid target, EntityUid user, string handId, StrippableComponent component, HandsComponent userHands)
{
if (!TryComp<HandsComponent>(target, out var targetHands)
|| !targetHands.Hands.TryGetValue(handId, out var hand))
if (!_handsSystem.TryGetHand(target, handId, out var hand))
return;
// is the target a handcuff?
@@ -274,7 +272,7 @@ namespace Content.Server.Strip
return false;
}
if (!hands.Hands.TryGetValue(handName, out var hand)
if (!_handsSystem.TryGetHand(target, handName, out var hand, hands)
|| !_handsSystem.CanPickupToHand(target, userHands.ActiveHandEntity.Value, hand, checkActionBlocker: false, hands))
{
_popup.PopupCursor(Loc.GetString("strippable-component-cannot-put-message",("owner", target)), user);
@@ -397,7 +395,7 @@ namespace Content.Server.Strip
bool Check()
{
if (!hands.Hands.TryGetValue(handName, out var hand) || hand.HeldEntity != item)
if (!_handsSystem.TryGetHand(target, handName, out var hand, hands) || hand.HeldEntity != item)
{
_popup.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message",("owner", target)), user);
return false;
@@ -432,7 +430,7 @@ namespace Content.Server.Strip
DuplicateCondition = DuplicateConditions.SameTool
};
if (Check() && hands.Hands.TryGetValue(handName, out var handSlot) && handSlot.HeldEntity != null)
if (Check() && _handsSystem.TryGetHand(target, handName, out var handSlot, hands) && handSlot.HeldEntity != null)
{
_popup.PopupEntity(
Loc.GetString("strippable-component-alert-owner",