X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fvampire%2Fsv_vampire.qc;h=12e4bdea43531a6fb1c8cbfc5154257f25fa9687;hb=771f981e95459c4b0e204b6f5e6c3cab28657b92;hp=08ced807441710bead6aa80c690f1e9657af697f;hpb=96586abdc3c3cfc37a225935aa4063a6bca73fa4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc b/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc index 08ced80744..12e4bdea43 100644 --- a/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc +++ b/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc @@ -14,12 +14,13 @@ MUTATOR_HOOKFUNCTION(vampire, PlayerDamage_SplitHealthArmor) float armor_take = bound(0, M_ARGV(5, float), GetResource(frag_target, RES_ARMOR)); float damage_take = (autocvar_g_vampire_use_total_damage) ? health_take + armor_take : health_take; - if(time >= frag_target.spawnshieldtime) - if(frag_target != frag_attacker) - if(IS_PLAYER(frag_attacker)) - if(!IS_DEAD(frag_target)) + if(time >= frag_target.spawnshieldtime && + frag_target != frag_attacker && + IS_PLAYER(frag_attacker) && + !IS_DEAD(frag_target)) { - GiveResource(frag_attacker, RES_HEALTH, autocvar_g_vampire_factor * damage_take); + GiveResource(frag_attacker, RES_HEALTH, + autocvar_g_vampire_factor * damage_take); } }