From 8f1aed5412a814a78b707abb8ef58f095a9659f5 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Fri, 25 Jun 2021 14:46:47 +0200 Subject: [PATCH] Remove workaround for engine bug in disposals. --- .../Disposal/Unit/Components/DisposalHolderComponent.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs index a2165d22f5..331b11675c 100644 --- a/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs +++ b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs @@ -23,7 +23,6 @@ namespace Content.Server.Disposal.Unit.Components { public override string Name => "DisposalHolder"; - private bool _deletionRequested = false; private Container _contents = null!; /// @@ -113,7 +112,7 @@ namespace Content.Server.Disposal.Unit.Components public void ExitDisposals() { - if (_deletionRequested || Deleted) + if (Deleted) return; PreviousTube = null; @@ -144,9 +143,7 @@ namespace Content.Server.Disposal.Unit.Components Air.Clear(); } - // FIXME: This is a workaround for https://github.com/space-wizards/RobustToolbox/issues/1646 - Owner.SpawnTimer(TimeSpan.Zero, () => Owner.Delete()); - _deletionRequested = true; + Owner.Delete(); } public void Update(float frameTime)