From 5db892c4244fa01678787f3e1da7c9bce9c44029 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 7 Mar 2013 17:51:34 +1100 Subject: [PATCH] Fix player not dying from no ammo --- qcsrc/server/mutators/mutator_minstagib.qc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) || -- 2.39.2