cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure BeingCarriedComponent removal cleans up Carrier's virtual items (#2729)

This commit is contained in:
BarryNorfolk 2025-01-15 23:35:48 +01:00 committed by GitHub
parent 75ebbd8857
commit 996006a236
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Shared/_DV/Carrying/CarryingSystem.cs
View File

@ -69,6 +69,7 @@ public sealed class CarryingSystem : EntitySystem
SubscribeLocalEvent<BeingCarriedComponent, StrappedEvent>(OnDrop);
SubscribeLocalEvent<BeingCarriedComponent, UnstrappedEvent>(OnDrop);
SubscribeLocalEvent<BeingCarriedComponent, EscapeInventoryEvent>(OnDrop);
SubscribeLocalEvent<BeingCarriedComponent, ComponentRemove>(OnRemoved);
SubscribeLocalEvent<CarriableComponent, CarryDoAfterEvent>(OnDoAfter);
}
@ -205,6 +206,19 @@ public sealed class CarryingSystem : EntitySystem
DropCarried(ent.Comp.Carrier, ent);
}
private void OnRemoved(Entity<BeingCarriedComponent> ent, ref ComponentRemove args)
{
/*
This component has been removed for whatever reason, so just make sure that the
carrier is cleaned up.
*/
if (!TryComp<CarryingComponent>(ent.Comp.Carrier, out var carryingComponent))
// This carrier has probably already been cleaned, no reason to try again
return;
CleanupCarrier(ent.Comp.Carrier, ent);
}
private void OnDoAfter(Entity<CarriableComponent> ent, ref CarryDoAfterEvent args)
{
if (args.Handled || args.Cancelled)
@ -295,6 +309,11 @@ public sealed class CarryingSystem : EntitySystem
public void DropCarried(EntityUid carrier, EntityUid carried)
{
Drop(carried);
CleanupCarrier(carrier, carried);
}
private void CleanupCarrier(EntityUid carrier, EntityUid carried)
{
RemComp<CarryingComponent>(carrier); // get rid of this first so we don't recursively fire that event
RemComp<CarryingSlowdownComponent>(carrier);
_virtualItem.DeleteInHandsMatching(carrier, carried);