Numerous enhancements to the new status effects system, split powerups into a dedicat...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / vampire / sv_vampire.qc

diff --git a/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc b/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc
index f4562a99ecadba751a10dfbc73a6c6a731723026..e8d1b5977e4fb1cd69bca6552a6ec669fc02313c 100644 (file)
--- a/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc
+++ b/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc
@@ -14,7 +14,7 @@ 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(!StatusEffects_active(STATUSEFFECT_SpawnShield, frag_target) &&
            frag_target != frag_attacker &&
            IS_PLAYER(frag_attacker) &&
            !IS_DEAD(frag_target) && !STAT(FROZEN, frag_target))