From: Mario <zacjardine@y7mail.com>
Date: Tue, 16 Dec 2014 10:58:53 +0000 (+1100)
Subject: Fix damage triggers
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8464f5a7b8919354b289c6b14ed4a73ac6b598fe;p=xonotic%2Fxonotic-data.pk3dir.git

Fix damage triggers
---

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)