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

Remove workaround for engine bug in disposals.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-06-25 14:46:47 +02:00
parent d6805f47a3
commit 8f1aed5412
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
View File

@@ -23,7 +23,6 @@ namespace Content.Server.Disposal.Unit.Components
{ {
public override string Name => "DisposalHolder"; public override string Name => "DisposalHolder";
private bool _deletionRequested = false;
private Container _contents = null!; private Container _contents = null!;
/// <summary> /// <summary>
@@ -113,7 +112,7 @@ namespace Content.Server.Disposal.Unit.Components
public void ExitDisposals() public void ExitDisposals()
{ {
if (_deletionRequested || Deleted) if (Deleted)
return; return;
PreviousTube = null; PreviousTube = null;
@@ -144,9 +143,7 @@ namespace Content.Server.Disposal.Unit.Components
Air.Clear(); Air.Clear();
} }
// FIXME: This is a workaround for https://github.com/space-wizards/RobustToolbox/issues/1646 Owner.Delete();
Owner.SpawnTimer(TimeSpan.Zero, () => Owner.Delete());
_deletionRequested = true;
} }
public void Update(float frameTime) public void Update(float frameTime)