From: Mario <mario.mario@y7mail.com>
Date: Sun, 19 Jul 2020 13:08:11 +0000 (+1000)
Subject: Also don't apply sound-based  damage to teammates
X-Git-Tag: xonotic-v0.8.5~845
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad0bdf3e6af32357a1b4e9a8fd112b781832dceb;p=xonotic%2Fxonotic-data.pk3dir.git

Also don't apply sound-based  damage to teammates
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 9eb3d86eb..626b3e5ac 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -585,8 +585,8 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de
 
 	entity attacker_save = attacker;
 
-	// special rule: gravity bomb does not hit team mates (other than for disconnecting the hook)
-	if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA))
+	// special rule: gravity bombs and sound-based attacks do not affect team mates (other than for disconnecting the hook)
+	if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || (deathtype & HITTYPE_SOUND))
 	{
 		if(IS_PLAYER(targ) && SAME_TEAM(targ, attacker))
 		{