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

Fix misc virtual item issues (#5980)

Browse Source
This commit is contained in:
Leon Friedrich
2022-01-10 17:22:56 +13:00
committed by GitHub
parent 5ceb2372bf
commit 19b1c003e0
7 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ namespace Content.Server.Hands.Systems
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] private readonly AdminLogSystem _logSystem = default!;
[Dependency] private readonly StrippableSystem _strippableSystem = default!;
[Dependency] private readonly SharedHandVirtualItemSystem _virtualSystem = default!;
public override void Initialize()
{
@@ -115,6 +116,14 @@ namespace Content.Server.Hands.Systems
RaiseNetworkEvent(new PickupAnimationEvent(item, initialPosition, finalPosition), filter);
}
protected override void HandleContainerRemoved(EntityUid uid, SharedHandsComponent component, ContainerModifiedMessage args)
{
if (!Deleted(args.Entity) && TryComp(args.Entity, out HandVirtualItemComponent? @virtual))
_virtualSystem.Delete(@virtual, uid);
base.HandleContainerRemoved(uid, component, args);
}
#endregion
#region pulling