Merge remote-tracking branch 'origin/master'

space-sunrise · Feb 10, 2025 · 76d4935 · 76d4935
2 parents 07857c5 + 67316d6
commit 76d4935
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
@@ -324,13 +324,13 @@ private void CreateMapVote(ICommonSession? initiator)
 
                 _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Map vote finished: {picked.MapName}");
                 var ticker = _entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
-                if (ticker.CanUpdateMap())
+                // Sunrise-Start
+                if (ticker.RunLevel == GameRunLevel.PreRoundLobby)
                 {
-                    if (_gameMapManager.TrySelectMapIfEligible(picked.ID))
-                    {
-                        ticker.UpdateInfoText();
-                    }
+                    _cfg.SetCVar(CCVars.GameMap, picked.ID);
+                    ticker.UpdateInfoText();
                 }
+                // Sunrise-End
                 else
                 {
                     if (ticker.RoundPreloadTime <= TimeSpan.Zero)