diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs index 98991973b8..273e98c290 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs @@ -20,6 +20,9 @@ namespace Content.Server.Disposal.Unit.EntitySystems public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null, TransformComponent? holderTransform = null) { + if (Terminating(uid)) + return; + if (!Resolve(uid, ref holder, ref holderTransform)) return; if (holder.IsExitingDisposals) diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs index 3b1543dc2b..d8b6360e14 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs @@ -376,6 +376,9 @@ namespace Content.Server.Disposal.Unit.EntitySystems private void OnAnchorChanged(EntityUid uid, DisposalUnitComponent component, ref AnchorStateChangedEvent args) { + if (Terminating(uid)) + return; + UpdateVisualState(component); if (!args.Anchored) TryEjectContents(component);