Fix next map not being displayed on the lobby UI after map vote (#23231)

Fix map not being displayed in lobby ui after map vote

diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs
index f17a3aed37bb92790f49c11b49bbeb52bed3a672..04f7be016a0346b6eb02140f594024124caa25bf 100644 (file)
--- a/Content.Server/GameTicking/GameTicker.GamePreset.cs
+++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs
@@ -107,8 +107,8 @@ namespace Content.Server.GameTicking
                 return;
 
             Preset = preset;
-            UpdateInfoText();
             ValidateMap();
+            UpdateInfoText();
 
             if (force)
             {

diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs
index 292e09b6b220a715efb6a87610b5ea7c15953eb0..b31472ffa4c0c26634db6cea8e636a1850aaf0bc 100644 (file)
--- a/Content.Server/GameTicking/GameTicker.Lobby.cs
+++ b/Content.Server/GameTicking/GameTicker.Lobby.cs
@@ -68,13 +68,22 @@ namespace Content.Server.GameTicking
 
             if (!foundOne)
             {
-                stationNames.Append(Loc.GetString("game-ticker-no-map-selected"));
+                stationNames.Append(_gameMapManager.GetSelectedMap()?.MapName ??
+                                    Loc.GetString("game-ticker-no-map-selected"));
             }
 
             var gmTitle = Loc.GetString(preset.ModeTitle);
             var desc = Loc.GetString(preset.Description);
-            return Loc.GetString(RunLevel == GameRunLevel.PreRoundLobby ? "game-ticker-get-info-preround-text" : "game-ticker-get-info-text",
-                ("roundId", RoundId), ("playerCount", playerCount), ("readyCount", readyCount), ("mapName", stationNames.ToString()),("gmTitle", gmTitle),("desc", desc));
+            return Loc.GetString(
+                RunLevel == GameRunLevel.PreRoundLobby
+                    ? "game-ticker-get-info-preround-text"
+                    : "game-ticker-get-info-text",
+                ("roundId", RoundId),
+                ("playerCount", playerCount),
+                ("readyCount", readyCount),
+                ("mapName", stationNames.ToString()),
+                ("gmTitle", gmTitle),
+                ("desc", desc));
         }
 
         private TickerLobbyStatusEvent GetStatusMsg(ICommonSession session)