From e8db49653fa21bf88c253145f80b66dfc7a1d277 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Tue, 21 Jan 2014 14:00:09 -0500 Subject: [PATCH] Fix ordering of readyrestart with warmup and add gameover check --- qcsrc/server/sv_main.qc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 86f2e80fb..920f738ae 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -220,18 +220,19 @@ void StartFrame (void) game_delay_last = game_delay; + CreatureFrame (); + CheckRules_World (); + // if in warmup stage and limit for warmup is hit start match - if (warmup_stage) - if ((g_warmup_limit > 0 && time >= g_warmup_limit) + if(warmup_stage) + if(!gameover) + if((g_warmup_limit > 0 && time >= g_warmup_limit) || (g_warmup_limit == 0 && autocvar_timelimit != 0 && time >= autocvar_timelimit * 60)) { ReadyRestart(); return; } - CreatureFrame (); - CheckRules_World (); - bot_serverframe(); FOR_EACH_PLAYER(self) -- 2.39.2