From: Mario <mario.mario@y7mail.com>
Date: Thu, 7 Mar 2013 06:51:34 +0000 (+1100)
Subject: Fix player not dying from no ammo
X-Git-Tag: xonotic-v0.7.0~55^2~3^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5db892c4244fa01678787f3e1da7c9bce9c44029;p=xonotic%2Fxonotic-data.pk3dir.git

Fix player not dying from no ammo
---

diff --git a/qcsrc/server/mutators/mutator_minstagib.qc b/qcsrc/server/mutators/mutator_minstagib.qc
index 49c4a8f57..2dc001d85 100644
--- a/qcsrc/server/mutators/mutator_minstagib.qc
+++ b/qcsrc/server/mutators/mutator_minstagib.qc
@@ -182,7 +182,7 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayerPhysics)
 MUTATOR_HOOKFUNCTION(minstagib_SplitHealthArmor)
 {
 	damage_save = 0;
-	damage_take = frag_damage;
+	//damage_take = frag_damage; // frag_damage isn't even set here?!
 	
 	return FALSE;
 }
@@ -203,10 +203,10 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayStrengthSound)
 
 MUTATOR_HOOKFUNCTION(minstagib_PlayerDamage)
 {
-	if(autocvar_g_friendlyfire == 0)
+	if(autocvar_g_friendlyfire == 0 && !IsDifferentTeam(frag_target, frag_attacker) && IS_PLAYER(frag_target))
 		frag_damage = 0;
 		
-	if(frag_target.classname == "player")
+	if(IS_PLAYER(frag_target))
 	{
 		if ((frag_deathtype == DEATH_FALL)  ||
 			(frag_deathtype == DEATH_DROWN) ||