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

"Fix" doors getting stuck ond eny (#2647)

Browse Source 
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2020-12-02 04:26:39 +11:00
committed by GitHub
parent b8220a3cd6
commit 0812233f20
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Server.GameObjects.Components.Doors
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
protected float CloseSpeed = AutoCloseDelay; protected float CloseSpeed = AutoCloseDelay;
private readonly CancellationTokenSource _cancellationTokenSource = new(); private CancellationTokenSource? _cancellationTokenSource;
protected virtual TimeSpan CloseTimeOne => TimeSpan.FromSeconds(0.3f); protected virtual TimeSpan CloseTimeOne => TimeSpan.FromSeconds(0.3f);
protected virtual TimeSpan CloseTimeTwo => TimeSpan.FromSeconds(0.9f); protected virtual TimeSpan CloseTimeTwo => TimeSpan.FromSeconds(0.9f);
@@ -259,6 +259,9 @@ namespace Content.Server.GameObjects.Components.Doors
occluder.Enabled = false; occluder.Enabled = false;
} }
_cancellationTokenSource?.Cancel();
_cancellationTokenSource = new();
Owner.SpawnTimer(OpenTimeOne, async () => Owner.SpawnTimer(OpenTimeOne, async () =>
{ {
if (Owner.TryGetComponent(out AirtightComponent? airtight)) if (Owner.TryGetComponent(out AirtightComponent? airtight))
@@ -412,6 +415,9 @@ namespace Content.Server.GameObjects.Components.Doors
occluder.Enabled = true; occluder.Enabled = true;
} }
_cancellationTokenSource?.Cancel();
_cancellationTokenSource = new();
Owner.SpawnTimer(CloseTimeOne, async () => Owner.SpawnTimer(CloseTimeOne, async () =>
{ {
if (shouldCheckCrush && _canCrush) if (shouldCheckCrush && _canCrush)
@@ -444,6 +450,8 @@ namespace Content.Server.GameObjects.Components.Doors
if (State == DoorState.Open || _isWeldedShut) if (State == DoorState.Open || _isWeldedShut)
return; return;
_cancellationTokenSource?.Cancel();
_cancellationTokenSource = new();
SetAppearance(DoorVisualState.Deny); SetAppearance(DoorVisualState.Deny);
Owner.SpawnTimer(DenyTime, () => Owner.SpawnTimer(DenyTime, () =>
{ {