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

Remove IHandsComponent and ISharedHandsComponent (#5218)

Browse Source 
* Remove IHandsComponent and ISharedHandsComponent

* Copy the documentation from the interfaces

* Revert "Copy the documentation from the interfaces"

This reverts commit 7638a2d4817743d487c7b255ba3e56add77dca86.

* Perform a minute amount of cleanup
This commit is contained in:
Javier Guardia Fernández
2021-11-08 15:08:24 +01:00
committed by GitHub
parent 162cde1b32
commit ec9e65951c
25 changed files with 42 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Interaction/InteractionSystem.cs
View File

@@ -2,12 +2,10 @@ using System;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Buckle.Components;
using Content.Server.CombatMode;
using Content.Server.Hands.Components;
using Content.Server.Items;
using Content.Server.Pulling;
using Content.Server.Verbs;
using Content.Shared.ActionBlocker;
using Content.Shared.DragDrop;
using Content.Shared.Input;
@@ -15,8 +13,6 @@ using Content.Shared.Interaction;
using Content.Shared.Interaction.Helpers;
using Content.Shared.Popups;
using Content.Shared.Pulling.Components;
using Content.Shared.Rotatable;
using Content.Shared.Timing;
using Content.Shared.Weapons.Melee;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
@@ -29,9 +25,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Players;
using Robust.Shared.Random;
namespace Content.Server.Interaction
{
@@ -314,7 +308,7 @@ namespace Content.Server.Interaction
}
// Verify user has a hand, and find what object they are currently holding in their active hand
if (!user.TryGetComponent<IHandsComponent>(out var hands))
if (!user.TryGetComponent<HandsComponent>(out var hands))
return;
var item = hands.GetActiveHand?.Owner;
@@ -460,7 +454,7 @@ namespace Content.Server.Interaction
}
// Verify user has a hand, and find what object they are currently holding in their active hand
if (user.TryGetComponent<IHandsComponent>(out var hands))
if (user.TryGetComponent<HandsComponent>(out var hands))
{
var item = hands.GetActiveHand?.Owner;