From: Mario Date: Sat, 26 Mar 2016 16:07:27 +0000 (+1000) Subject: Always disable self damage from the blaster in instagib X-Git-Tag: xonotic-v0.8.2~1004 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=27d2a15558557cad8efd0b2ef74311a9b0b4104c;hp=a0244f34e33a974c41eb5464052f152fca91feb6 Always disable self damage from the blaster in instagib --- diff --git a/qcsrc/common/mutators/mutator/instagib/instagib.qc b/qcsrc/common/mutators/mutator/instagib/instagib.qc index f0cbf6afc..f8f2e5a7d 100644 --- a/qcsrc/common/mutators/mutator/instagib/instagib.qc +++ b/qcsrc/common/mutators/mutator/instagib/instagib.qc @@ -302,7 +302,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerDamage_Calculate) { if(frag_deathtype & HITTYPE_SECONDARY) { - if(!autocvar_g_instagib_blaster_keepdamage) + if(!autocvar_g_instagib_blaster_keepdamage || frag_attacker == frag_target) frag_damage = frag_mirrordamage = 0; if(frag_target != frag_attacker)