From: FruitieX <rasse@rasse-laptop.(none)>
Date: Sat, 23 Oct 2010 13:34:46 +0000 (+0300)
Subject: no damage after the round has ended in CA or arena
X-Git-Tag: xonotic-v0.1.0preview~245^2~8^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c259bdf6984356dc3feafefa999fe6f4ee875d62;p=xonotic%2Fxonotic-data.pk3dir.git

no damage after the round has ended in CA or arena
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index c7336356c..6a636a16b 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -478,6 +478,9 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 
 	if (gameover || targ.killcount == -666)
 		return;
+	if(g_arena || g_ca)
+	if(champion && champion.classname == "player" && player_count > 1)
+		return;
 
 	local entity oldself;
 	oldself = self;