From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 6 Oct 2012 14:48:55 +0000 (+0300)
Subject: Use a more correct code for the arena part. Old one worked well but this should be... 
X-Git-Tag: xonotic-v0.7.0~198^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f32862ef30de75a5f3aee2f579e936993d49bb19;p=xonotic%2Fxonotic-data.pk3dir.git

Use a more correct code for the arena part. Old one worked well but this should be more consistent
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 22c2f0d5a..101e35cae 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2559,10 +2559,10 @@ void PlayerPreThink (void)
 	self.stat_allow_oldnexbeam = autocvar_g_allow_oldnexbeam;
 	self.stat_leadlimit = autocvar_leadlimit;
 
-	if(allowed_to_spawn)
-		self.stat_respawn_time = self.respawn_time;
-	else
+	if(g_arena || (g_ca && !allowed_to_spawn))
 		self.stat_respawn_time = 0;
+	else
+		self.stat_respawn_time = self.respawn_time;
 
 	if(frametime)
 	{