From: terencehill <piuntn@gmail.com>
Date: Tue, 26 Feb 2019 17:40:30 +0000 (+0100)
Subject: Don't log to weapon stats damage (0) dealt to frozen players
X-Git-Tag: xonotic-v0.8.5~688^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b99fd5fbb9d92106a7657937c8fe39915a9b79a7;p=xonotic%2Fxonotic-data.pk3dir.git

Don't log to weapon stats damage (0) dealt to frozen players
---

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 81c63f21c..ccdf7c16f 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -495,7 +495,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 	if(vbot || IS_REAL_CLIENT(this))
 	if(abot || IS_REAL_CLIENT(attacker))
 	if(attacker && this != attacker)
-	if(DIFF_TEAM(this, attacker))
+	if (DIFF_TEAM(this, attacker) && (!STAT(FROZEN, this) || this.freeze_time > time))
 	{
 		if(DEATH_ISSPECIAL(deathtype))
 			awep = attacker.(weaponentity).m_weapon;
@@ -504,8 +504,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		valid_damage_for_weaponstats = true;
 	}
 
-	dh = dh - max(GetResource(this, RES_HEALTH), 0);
-	da = da - max(GetResource(this, RES_ARMOR), 0);
+	dh -= max(GetResource(this, RES_HEALTH), 0); // health difference
+	da -= max(GetResource(this, RES_ARMOR), 0); // armor difference
 	if(valid_damage_for_weaponstats)
 	{
 		WeaponStats_LogDamage(awep.m_id, abot, this.(weaponentity).m_weapon.m_id, vbot, dh + da);