From: Mario <mario@smbclan.net>
Date: Thu, 10 Nov 2016 16:05:48 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~34
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05c1916e1f78c8233a0eb88b5f619d31ac5c9569;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/wepent_experimental
---

05c1916e1f78c8233a0eb88b5f619d31ac5c9569
diff --cc qcsrc/server/player.qc
index f466c4dde,904447c21..4a4d1301f
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@@ -509,11 -507,11 +509,11 @@@ void PlayerDamage(entity this, entity i
  	da = da - max(this.armorvalue, 0);
  	if(valid_damage_for_weaponstats)
  	{
 -		WeaponStats_LogDamage(awep.m_id, abot, PS(this).m_weapon.m_id, vbot, dh + da);
 +		WeaponStats_LogDamage(awep.m_id, abot, this.(weaponentity).m_weapon.m_id, vbot, dh + da);
  	}
- 	if (dh + da)
+ 	if (damage)
  	{
- 		MUTATOR_CALLHOOK(PlayerDamaged, attacker, this, dh, da, hitloc, deathtype);
+ 		MUTATOR_CALLHOOK(PlayerDamaged, attacker, this, dh, da, hitloc, deathtype, damage);
  	}
  
  	if (this.health < 1)