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

Fix round starting and db round spam

Browse Source 
Fixes https://github.com/space-wizards/space-station-14/issues/5467
RunLevel was being set after waiting for the DB, causing GameTicker.Update to fire during the wait
This commit is contained in:
DrSmugleaf
2021-11-23 18:12:24 +01:00
parent a2b7982c37
commit cc79053825
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/GameTicking/GameTicker.RoundFlow.cs
View File

@@ -103,12 +103,6 @@ namespace Content.Server.GameTicking
DebugTools.Assert(RunLevel == GameRunLevel.PreRoundLobby); DebugTools.Assert(RunLevel == GameRunLevel.PreRoundLobby);
Logger.InfoS("ticker", "Starting round!"); Logger.InfoS("ticker", "Starting round!");
var playerIds = _playersInLobby.Keys.Select(player => player.UserId.UserId).ToArray();
RoundId = await _db.AddNewRound(playerIds);
var startingEvent = new RoundStartingEvent();
RaiseLocalEvent(startingEvent);
SendServerMessage(Loc.GetString("game-ticker-start-round")); SendServerMessage(Loc.GetString("game-ticker-start-round"));
List<IPlayerSession> readyPlayers; List<IPlayerSession> readyPlayers;
@@ -126,6 +120,12 @@ namespace Content.Server.GameTicking
RoundLengthMetric.Set(0); RoundLengthMetric.Set(0);
var playerIds = _playersInLobby.Keys.Select(player => player.UserId.UserId).ToArray();
RoundId = await _db.AddNewRound(playerIds);
var startingEvent = new RoundStartingEvent();
RaiseLocalEvent(startingEvent);
// Get the profiles for each player for easier lookup. // Get the profiles for each player for easier lookup.
var profiles = _prefsManager.GetSelectedProfilesForPlayers( var profiles = _prefsManager.GetSelectedProfilesForPlayers(
readyPlayers readyPlayers