From: terencehill <piuntn@gmail.com>
Date: Sat, 17 Nov 2012 14:35:38 +0000 (+0100)
Subject: Fix for bug #1135: players receive no damage after a restart command called by a... 
X-Git-Tag: xonotic-v0.7.0~61^2~124
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2742c619354e61aee095f081b8baa1d63200bfb9;p=xonotic%2Fxonotic-data.pk3dir.git

Fix for bug #1135: players receive no damage after a restart command called by a dedicated server with bots
Respecting initial game delay (cvar g_start_delay) in CA too seems to fix it
---

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index ef81fd92b..71457c0e5 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -33,7 +33,7 @@ void reset_map(float dorespawn)
 	if(g_arena && autocvar_g_arena_warmup)
 		warmup = time + autocvar_g_arena_warmup;
 	else if(g_ca) {
-		warmup = time + autocvar_g_ca_warmup;
+		warmup = max(time, game_starttime) + autocvar_g_ca_warmup;
 		allowed_to_spawn = 1;
 	}
 	else if(g_freezetag)