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

Kill ContainerHelpers (#20908)

Browse Source
This commit is contained in:
Kara
2023-10-11 02:18:49 -07:00
committed by GitHub
parent 14dac914ce
commit dbb7c7065a
14 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
View File

@@ -11,11 +11,11 @@ using Robust.Shared.Input.Binding;
namespace Content.Shared.Hands.EntitySystems;
public abstract partial class SharedHandsSystem : EntitySystem
public abstract partial class SharedHandsSystem
{
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly SharedItemSystem _items = default!;
[Dependency] private readonly SharedStorageSystem _storage = default!;
@@ -47,7 +47,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
if (handsComp.Hands.ContainsKey(handName))
return;
var container = _containerSystem.EnsureContainer<ContainerSlot>(uid, handName);
var container = ContainerSystem.EnsureContainer<ContainerSlot>(uid, handName);
container.OccludesLight = false;
var newHand = new Hand(handName, handLocation, container);
@@ -57,8 +57,8 @@ public abstract partial class SharedHandsSystem : EntitySystem
if (handsComp.ActiveHand == null)
SetActiveHand(uid, newHand, handsComp);
RaiseLocalEvent(uid, new HandCountChangedEvent(uid), false);
Dirty(handsComp);
RaiseLocalEvent(uid, new HandCountChangedEvent(uid));
Dirty(uid, handsComp);
}
public virtual void RemoveHand(EntityUid uid, string handName, HandsComponent? handsComp = null)
@@ -76,8 +76,8 @@ public abstract partial class SharedHandsSystem : EntitySystem
if (handsComp.ActiveHand == hand)
TrySetActiveHand(uid, handsComp.SortedHands.FirstOrDefault(), handsComp);
RaiseLocalEvent(uid, new HandCountChangedEvent(uid), false);
Dirty(handsComp);
RaiseLocalEvent(uid, new HandCountChangedEvent(uid));
Dirty(uid, handsComp);
}
/// <summary>
@@ -169,7 +169,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
if (name == handsComp.ActiveHand?.Name)
continue;
if (handsComp.Hands[name].HeldEntity is EntityUid held)
if (handsComp.Hands[name].HeldEntity is { } held)
yield return held;
}
}
@@ -206,8 +206,8 @@ public abstract partial class SharedHandsSystem : EntitySystem
if (hand == handComp.ActiveHand)
return false;
if (handComp.ActiveHand?.HeldEntity is EntityUid held)
RaiseLocalEvent(held, new HandDeselectedEvent(uid), false);
if (handComp.ActiveHand?.HeldEntity is { } held)
RaiseLocalEvent(held, new HandDeselectedEvent(uid));
if (hand == null)
{
@@ -219,8 +219,9 @@ public abstract partial class SharedHandsSystem : EntitySystem
OnHandSetActive?.Invoke(handComp);
if (hand.HeldEntity != null)
RaiseLocalEvent(hand.HeldEntity.Value, new HandSelectedEvent(uid), false);
Dirty(handComp);
RaiseLocalEvent(hand.HeldEntity.Value, new HandSelectedEvent(uid));
Dirty(uid, handComp);
return true;
}