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

Fixes airlock autoclose, adds a sanity check to welding doors shut. (#3211)

Browse Source 
* removes unused door var, sanity checks welding

* Fixes doors failing to autoclose.
This commit is contained in:
tmtmtl30
2021-02-15 04:01:26 -08:00
committed by GitHub
parent ff68d30a8e
commit 37eaa510e0
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,13 +67,6 @@ namespace Content.Server.GameObjects.Components.Doors
} }
} }
/// <summary>
/// The amount of time the door has been open. Used to automatically close the door if it autocloses.
/// </summary>
[ViewVariables]
private float _openTimeCounter;
[ViewVariables(VVAccess.ReadWrite)]
private static readonly TimeSpan AutoCloseDelay = TimeSpan.FromSeconds(5); private static readonly TimeSpan AutoCloseDelay = TimeSpan.FromSeconds(5);
private CancellationTokenSource? _stateChangeCancelTokenSource; private CancellationTokenSource? _stateChangeCancelTokenSource;
@@ -441,7 +434,6 @@ namespace Content.Server.GameObjects.Components.Doors
public void Close() public void Close()
{ {
State = DoorState.Closing; State = DoorState.Closing;
_openTimeCounter = 0;
// no more autoclose; we ARE closed // no more autoclose; we ARE closed
_autoCloseCancelTokenSource?.Cancel(); _autoCloseCancelTokenSource?.Cancel();
@@ -573,7 +565,7 @@ namespace Content.Server.GameObjects.Components.Doors
var realCloseTime = _doorCheck.GetCloseSpeed() ?? AutoCloseDelay; var realCloseTime = _doorCheck.GetCloseSpeed() ?? AutoCloseDelay;
Owner.SpawnTimer(realCloseTime, async () => Owner.SpawnRepeatingTimer(realCloseTime, async () =>
{ {
if (CanCloseGeneric()) if (CanCloseGeneric())
{ {
@@ -628,6 +620,12 @@ namespace Content.Server.GameObjects.Components.Doors
_beingWelded = true; _beingWelded = true;
if(await welder.UseTool(eventArgs.User, Owner, 3f, ToolQuality.Welding, 3f, () => CanWeldShut)) if(await welder.UseTool(eventArgs.User, Owner, 3f, ToolQuality.Welding, 3f, () => CanWeldShut))
{ {
// just in case
if (!CanWeldShut)
{
return false;
}
_beingWelded = false; _beingWelded = false;
IsWeldedShut = !IsWeldedShut; IsWeldedShut = !IsWeldedShut;
return true; return true;