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

Correct anchor events (#6140)

Browse Source
This commit is contained in:
Leon Friedrich
2022-01-13 06:49:28 +13:00
committed by GitHub
parent 2aefca868d
commit 21480c716a
6 changed files with 33 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -45,15 +45,14 @@ namespace Content.Server.Disposal.Unit.EntitySystems
{
base.Initialize();
SubscribeLocalEvent<DisposalUnitComponent, AnchoredEvent>(OnAnchored);
SubscribeLocalEvent<DisposalUnitComponent, UnanchoredEvent>(OnUnanchored);
SubscribeLocalEvent<DisposalUnitComponent, AnchorStateChangedEvent>(OnAnchorChanged);
// TODO: Predict me when hands predicted
SubscribeLocalEvent<DisposalUnitComponent, RelayMovementEntityEvent>(HandleMovement);
SubscribeLocalEvent<DisposalUnitComponent, PowerChangedEvent>(HandlePowerChange);
// Component lifetime
SubscribeLocalEvent<DisposalUnitComponent, ComponentInit>(HandleDisposalInit);
SubscribeLocalEvent<DisposalUnitComponent, ComponentShutdown>(HandleDisposalShutdown);
SubscribeLocalEvent<DisposalUnitComponent, ComponentRemove>(HandleDisposalRemove);
SubscribeLocalEvent<DisposalUnitComponent, ThrowHitByEvent>(HandleThrowCollide);
@@ -244,7 +243,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
}
}
private void HandleDisposalShutdown(EntityUid uid, DisposalUnitComponent component, ComponentShutdown args)
private void HandleDisposalRemove(EntityUid uid, DisposalUnitComponent component, ComponentRemove args)
{
foreach (var entity in component.Container.ContainedEntities.ToArray())
{
@@ -313,15 +312,11 @@ namespace Content.Server.Disposal.Unit.EntitySystems
Remove(component, args.Entity);
}
private void OnAnchored(EntityUid uid, DisposalUnitComponent component, AnchoredEvent args)
private void OnAnchorChanged(EntityUid uid, DisposalUnitComponent component, ref AnchorStateChangedEvent args)
{
UpdateVisualState(component);
}
private void OnUnanchored(EntityUid uid, DisposalUnitComponent component, UnanchoredEvent args)
{
UpdateVisualState(component);
TryEjectContents(component);
if (!args.Anchored)
TryEjectContents(component);
}
#endregion