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

Fix some more "CentCom" instances (#9970)

Browse Source
This commit is contained in:
Myctai
2022-07-26 14:00:38 +00:00
committed by GitHub
parent 47a5c98bd8
commit 43ec284318
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
View File

@@ -123,24 +123,24 @@ public sealed partial class ShuttleSystem
{
_launchedShuttles = true;
if (_centcommMap != null)
if (_centComMap != null)
{
foreach (var comp in EntityQuery<StationDataComponent>(true))
{
if (!TryComp<ShuttleComponent>(comp.EmergencyShuttle, out var shuttle)) continue;
if (Deleted(_centcomm))
if (Deleted(_centCom))
{
// TODO: Need to get non-overlapping positions.
FTLTravel(shuttle,
new EntityCoordinates(
_mapManager.GetMapEntityId(_centcommMap.Value),
_mapManager.GetMapEntityId(_centComMap.Value),
Vector2.One * 1000f), _consoleAccumulator, TransitTime);
}
else
{
FTLTravel(shuttle,
_centcomm.Value, _consoleAccumulator, TransitTime, dock: true);
_centCom.Value, _consoleAccumulator, TransitTime, dock: true);
}
}
}
@@ -156,8 +156,8 @@ public sealed partial class ShuttleSystem
Timer.Spawn((int) (TransitTime * 1000) + _bufferTime.Milliseconds, () => _roundEnd.EndRound(), _roundEndCancelToken.Token);
// Guarantees that emergency shuttle arrives first before anyone else can FTL.
if (_centcomm != null)
AddFTLDestination(_centcomm.Value, true);
if (_centCom != null)
AddFTLDestination(_centCom.Value, true);
}
}