From fdc31bbe15411a52805a9c19f58302a85e306341 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 22 Feb 2023 12:47:05 +1100
Subject: [PATCH] Fix emergency shuttle spawning (#14214)

---
 Content.Server/GameTicking/GameTicker.GamePreset.cs | 3 ---
 Content.Server/GameTicking/GameTicker.RoundFlow.cs  | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs
index 41622d6e82..eb44943e76 100644
--- 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 5e45894c16..ab9c7ea4bf 100644
--- 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>();
 
-- 
2.52.0