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

Fix FTL exception (#10099)

Browse Source 
Will also just log in future so we know what did it.
This commit is contained in:
metalgearsloth
2022-07-28 16:27:23 +10:00
committed by GitHub
parent 8caae58a95
commit ac67ae7b1e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@@ -162,7 +162,6 @@ public sealed partial class ShuttleSystem
if (!TrySetupFTL(component, out var hyperspace)) if (!TrySetupFTL(component, out var hyperspace))
return; return;
hyperspace.State = FTLState.Starting;
hyperspace.StartupTime = startupTime; hyperspace.StartupTime = startupTime;
hyperspace.TravelTime = hyperspaceTime; hyperspace.TravelTime = hyperspaceTime;
hyperspace.Accumulator = hyperspace.StartupTime; hyperspace.Accumulator = hyperspace.StartupTime;
@@ -194,6 +193,7 @@ public sealed partial class ShuttleSystem
SetDocks(uid, false); SetDocks(uid, false);
component = AddComp<FTLComponent>(uid); component = AddComp<FTLComponent>(uid);
component.State = FTLState.Starting;
// TODO: Need BroadcastGrid to not be bad. // TODO: Need BroadcastGrid to not be bad.
SoundSystem.Play(_startupSound.GetSound(), Filter.Empty().AddInRange(Transform(uid).MapPosition, GetSoundRange(component.Owner)), _startupSound.Params); SoundSystem.Play(_startupSound.GetSound(), Filter.Empty().AddInRange(Transform(uid).MapPosition, GetSoundRange(component.Owner)), _startupSound.Params);
// Make sure the map is setup before we leave to avoid pop-in (e.g. parallax). // Make sure the map is setup before we leave to avoid pop-in (e.g. parallax).
@@ -314,7 +314,9 @@ public sealed partial class ShuttleSystem
_console.RefreshShuttleConsoles(comp.Owner); _console.RefreshShuttleConsoles(comp.Owner);
break; break;
default: default:
throw new ArgumentOutOfRangeException(); _sawmill.Error($"Found invalid FTL state {comp.State} for {comp.Owner}");
RemComp<FTLComponent>(comp.Owner);
break;
} }
} }
} }