From ad0bdf3e6af32357a1b4e9a8fd112b781832dceb Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 19 Jul 2020 23:08:11 +1000 Subject: [PATCH] Also don't apply sound-based damage to teammates --- qcsrc/server/g_damage.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)) { -- 2.39.2