From fdcb2f26fb582af8a9252c56820fc25456be33d9 Mon Sep 17 00:00:00 2001
From: oy <Tom_Adams@web.de>
Date: Sat, 27 Oct 2018 11:51:23 +0200
Subject: [PATCH] switch to game start timer for the last 3 seconds of warmup
 to prevent 2 timers. #1567

---
 src/game/server/gamecontroller.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index d6945396f..2834bdddc 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -746,6 +746,8 @@ void IGameController::Tick()
 				// check if player ready mode was disabled and it waits that all players are ready -> end warmup
 				if(!g_Config.m_SvPlayerReadyMode && m_GameStateTimer == TIMER_INFINITE)
 					SetGameState(IGS_WARMUP_USER, 0);
+				else if(m_GameStateTimer == 3 * Server()->TickSpeed())
+					StartRound();
 				break;
 			case IGS_START_COUNTDOWN:
 			case IGS_GAME_PAUSED: