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

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

@@ -1,4 +1,3 @@
using Content.Server.Hands.Components;
using Content.Server.Popups;
using Content.Server.Pulling;
using Content.Server.Stack;
@@ -110,7 +109,7 @@ namespace Content.Server.Hands.Systems
RaiseNetworkEvent(new PickupAnimationEvent(item, initialPosition, finalPosition), filter);
}
private void HandleEntityRemoved(EntityUid uid, SharedHandsComponent component, EntRemovedFromContainerMessage args)
private void HandleEntityRemoved(EntityUid uid, HandsComponent component, EntRemovedFromContainerMessage args)
{
if (!Deleted(args.Entity) && TryComp(args.Entity, out HandVirtualItemComponent? @virtual))
_virtualSystem.Delete(@virtual, uid);
@@ -186,7 +185,7 @@ namespace Content.Server.Hands.Systems
if (playerSession.AttachedEntity is not {Valid: true} player ||
!Exists(player) ||
player.IsInContainer() ||
!TryComp(player, out SharedHandsComponent? hands) ||
!TryComp(player, out HandsComponent? hands) ||
hands.ActiveHandEntity is not EntityUid throwEnt ||
!_actionBlockerSystem.CanThrow(player, throwEnt))
return false;
@@ -248,7 +247,7 @@ namespace Content.Server.Hands.Systems
if (!_actionBlockerSystem.CanInteract(plyEnt, null))
return;
if (!TryComp<SharedHandsComponent>(plyEnt, out var hands) || hands.ActiveHand == null)
if (!TryComp<HandsComponent>(plyEnt, out var hands) || hands.ActiveHand == null)
return;
if (!_inventorySystem.TryGetSlotEntity(plyEnt, equipmentSlot, out var slotEntity) ||