From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 17 Dec 2014 00:03:50 +0000 (+1100)
Subject: Remove environment immunity
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8030ff872b9a337b7b68fe919d0c50c1da344c30;p=xonotic%2Fxonotic-data.pk3dir.git

Remove environment immunity
---

diff --git a/qcsrc/server/mutators/gamemode_infection.qc b/qcsrc/server/mutators/gamemode_infection.qc
index a1c92bd7a2..d56fddbe46 100644
--- a/qcsrc/server/mutators/gamemode_infection.qc
+++ b/qcsrc/server/mutators/gamemode_infection.qc
@@ -225,11 +225,9 @@ MUTATOR_HOOKFUNCTION(infection_PlayerPreThink)
 MUTATOR_HOOKFUNCTION(infection_PlayerDamage_Calculate)
 {
 	if (
-	(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)
-	|| (frag_deathtype == DEATH_LAVA)
+	IS_PLAYER(frag_attacker) // Allow environment damage
+	&& frag_attacker != frag_target  // Allow self damage
+	&& frag_attacker.infectioncolor == frag_target.infectioncolor // Block friendly fire
 	)
 	{
 		frag_damage = 0;