Properly set game start delay in arena too (however arena logic was already good...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / arena.qc

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 6917458152dd0b6c4d017616438176dfbbff2e20..3300673f3e0a8a6784257cea0e1b395413365042 100644 (file)
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -31,7 +31,7 @@ void reset_map(float dorespawn)
        oldself = self;
 
        if(g_arena && autocvar_g_arena_warmup)
-               warmup = time + autocvar_g_arena_warmup;
+               warmup = max(time, game_starttime) + autocvar_g_arena_warmup;
        else if(g_ca) {
                warmup = max(time, game_starttime) + autocvar_g_ca_warmup;
                allowed_to_spawn = 1;