From 8464f5a7b8919354b289c6b14ed4a73ac6b598fe Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 16 Dec 2014 21:58:53 +1100 Subject: [PATCH] Fix damage triggers --- qcsrc/server/mutators/gamemode_infection.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_infection.qc b/qcsrc/server/mutators/gamemode_infection.qc index 012e44213e..a1c92bd7a2 100644 --- a/qcsrc/server/mutators/gamemode_infection.qc +++ b/qcsrc/server/mutators/gamemode_infection.qc @@ -225,7 +225,7 @@ MUTATOR_HOOKFUNCTION(infection_PlayerPreThink) MUTATOR_HOOKFUNCTION(infection_PlayerDamage_Calculate) { if ( - (frag_attacker.infectioncolor == frag_target.infectioncolor && frag_attacker != frag_target) + (IS_PLAYER(frag_attacker) && frag_attacker.infectioncolor == frag_target.infectioncolor && frag_attacker != frag_target) || (frag_deathtype == DEATH_FALL) || (frag_deathtype == DEATH_DROWN) || (frag_deathtype == DEATH_SLIME) @@ -235,7 +235,7 @@ MUTATOR_HOOKFUNCTION(infection_PlayerDamage_Calculate) frag_damage = 0; frag_force = '0 0 0'; } - return TRUE; + return FALSE; } MUTATOR_HOOKFUNCTION(infection_BotShouldAttack) -- 2.39.2