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

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

Browse Source 
Fix map not being displayed in lobby ui after map vote
This commit is contained in:
Kot
2023-12-30 21:51:36 +04:00
committed by GitHub
parent 37a32b7a0b
commit f8c83b7134
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameTicking/GameTicker.GamePreset.cs
View File

@@ -107,8 +107,8 @@ namespace Content.Server.GameTicking
return; return;
Preset = preset; Preset = preset;
UpdateInfoText();
ValidateMap(); ValidateMap();
UpdateInfoText();
if (force) if (force)
{ {

15
Content.Server/GameTicking/GameTicker.Lobby.cs
View File

@@ -68,13 +68,22 @@ namespace Content.Server.GameTicking
if (!foundOne) 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 gmTitle = Loc.GetString(preset.ModeTitle);
var desc = Loc.GetString(preset.Description); var desc = Loc.GetString(preset.Description);
return Loc.GetString(RunLevel == GameRunLevel.PreRoundLobby ? "game-ticker-get-info-preround-text" : "game-ticker-get-info-text", return Loc.GetString(
("roundId", RoundId), ("playerCount", playerCount), ("readyCount", readyCount), ("mapName", stationNames.ToString()),("gmTitle", gmTitle),("desc", desc)); 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) private TickerLobbyStatusEvent GetStatusMsg(ICommonSession session)