From: terencehill <piuntn@gmail.com>
Date: Mon, 25 Feb 2019 20:49:58 +0000 (+0100)
Subject: Initially don't alter damage with teamplay rules if it's dealt to a frozen player... 
X-Git-Tag: xonotic-v0.8.5~688^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89a3a4c6b5f46ce8bcb4b25f18bbaa3c40e72b7f;p=xonotic%2Fxonotic-data.pk3dir.git

Initially don't alter damage with teamplay rules if it's dealt to a frozen player so it gets processed correctly in the Damage_Calculate hook
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 0901ab447..8020b120d 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -613,7 +613,7 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de
 				damage = 0;
 				force = '0 0 0';
 			}
-			else if(SAME_TEAM(attacker, targ))
+			else if(!STAT(FROZEN, targ) && SAME_TEAM(attacker, targ))
 			{
 				if(autocvar_teamplay_mode == 1)
 					damage = 0;