Fix emergency shuttle spawning (#14214)

diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs
index 41622d6e822c48d1cd6cfff9945bb33250792c11..eb44943e76f31bd1b976c5ecef1df97d37f7bb42 100644 (file)
--- a/Content.Server/GameTicking/GameTicker.GamePreset.cs
+++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs
@@ -260,9 +260,6 @@ namespace Content.Server.GameTicking
 
             _taskManager.BlockWaitOnTask(task);
             RoundId = task.GetAwaiter().GetResult();
-
-            var startingEvent = new RoundStartingEvent(RoundId);
-            RaiseLocalEvent(startingEvent);
         }
     }
 

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 5e45894c16d0aa0bb70d9680363a9a7b01a48b6e..ab9c7ea4bf0a27033cf2f149317ba432607991fe 100644 (file)
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -180,6 +180,8 @@ namespace Content.Server.GameTicking
 
             RoundLengthMetric.Set(0);
 
+            var startingEvent = new RoundStartingEvent(RoundId);
+            RaiseLocalEvent(startingEvent);
             var readyPlayers = new List<IPlayerSession>();
             var readyPlayerProfiles = new Dictionary<NetUserId, HumanoidCharacterProfile>();