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

Fix disposal unit termination (#12266)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-29 10:59:01 +13:00
committed by GitHub
parent a2e6ab2d07
commit 1e97d6defb
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
View File

@@ -20,6 +20,9 @@ namespace Content.Server.Disposal.Unit.EntitySystems
public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null, TransformComponent? holderTransform = null) public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null, TransformComponent? holderTransform = null)
{ {
if (Terminating(uid))
return;
if (!Resolve(uid, ref holder, ref holderTransform)) if (!Resolve(uid, ref holder, ref holderTransform))
return; return;
if (holder.IsExitingDisposals) if (holder.IsExitingDisposals)

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

@@ -376,6 +376,9 @@ namespace Content.Server.Disposal.Unit.EntitySystems
private void OnAnchorChanged(EntityUid uid, DisposalUnitComponent component, ref AnchorStateChangedEvent args) private void OnAnchorChanged(EntityUid uid, DisposalUnitComponent component, ref AnchorStateChangedEvent args)
{ {
if (Terminating(uid))
return;
UpdateVisualState(component); UpdateVisualState(component);
if (!args.Anchored) if (!args.Anchored)
TryEjectContents(component); TryEjectContents(component);