Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix tool do-after return values (#5764)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-14 02:31:40 +13:00
committed by GitHub
parent f04bd5996f
commit 5a4c08ccdf
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Content.Server/Doors/Components/ServerDoorComponent.cs
View File

@@ -705,36 +705,31 @@ namespace Content.Server.Doors.Components
{
Close();
}
return true;
}
// regardless of whether this action actually succeeded, it generated a do-after bar. So prevent other
// interactions from happening afterwards by returning true.
return true;
}
// for welding doors
if (CanWeldShut && _entMan.TryGetComponent(tool.Owner, out WelderComponent? welder) && welder.Lit)
if (_beingWelded || !CanWeldShut || !_entMan.TryGetComponent(tool.Owner, out WelderComponent? welder) || !welder.Lit)
{
if(!_beingWelded)
{
_beingWelded = true;
if(await toolSystem.UseTool(eventArgs.Using, eventArgs.User, Owner, 3f, 3f, _weldingQuality, () => CanWeldShut))
{
// just in case
if (!CanWeldShut)
{
return false;
}
// no interaction occurred
return false;
}
_beingWelded = true;
_beingWelded = false;
IsWeldedShut = !IsWeldedShut;
return true;
}
_beingWelded = false;
}
}
else
{
_beingWelded = false;
}
return false;
// perform a do-after delay
var result = await toolSystem.UseTool(eventArgs.Using, eventArgs.User, Owner, 3f, 3f, _weldingQuality, () => CanWeldShut);
// if successful, toggle the weld-status (while also ensuring that it can still be welded shut after the delay)
if (result)
IsWeldedShut = CanWeldShut && !IsWeldedShut;
_beingWelded = false;
return true;
}
/// <summary>