From 1e97d6defbd32585083585cef1d36f60dee22dcc Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 29 Oct 2022 10:59:01 +1300
Subject: [PATCH] Fix disposal unit termination (#12266)

---
 Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs | 3 +++
 .../Disposal/Unit/EntitySystems/DisposalUnitSystem.cs          | 3 +++
 2 files changed, 6 insertions(+)

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);