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

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Client/Hands/Systems/HandsSystem.cs
View File

@@ -1,7 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Numerics;
using Content.Client.Animations;
using Content.Client.Examine;
using Content.Client.Strip;
using Content.Client.Verbs.UI;
@@ -15,7 +13,6 @@ using Robust.Client.Player;
using Robust.Client.UserInterface;
using Robust.Shared.Containers;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
using Robust.Shared.Timing;
namespace Content.Client.Hands.Systems
@@ -416,21 +413,21 @@ namespace Content.Client.Hands.Systems
base.RemoveHand(uid, handName, handsComp);
}
private void OnHandActivated(HandsComponent? handsComponent)
private void OnHandActivated(Entity<HandsComponent>? ent)
{
if (handsComponent == null)
if (ent is not { } hand)
return;
if (_playerManager.LocalPlayer?.ControlledEntity != handsComponent.Owner)
if (_playerManager.LocalPlayer?.ControlledEntity != hand.Owner)
return;
if (handsComponent.ActiveHand == null)
if (hand.Comp.ActiveHand == null)
{
OnPlayerSetActiveHand?.Invoke(null);
return;
}
OnPlayerSetActiveHand?.Invoke(handsComponent.ActiveHand.Name);
OnPlayerSetActiveHand?.Invoke(hand.Comp.ActiveHand.Name);
}
}
}