From 7babc86d4c5d845780109398b554634634331f31 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Sun, 2 Mar 2008 15:01:24 +0000 Subject: [PATCH] fixed bug where g_vampire healing worked on spawn-shielded players (such as in g_midair mode) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3475 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/g_damage.qc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index b08d61456..16ec5b9de 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -542,7 +542,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if(targ.classname == "player" && attacker.classname == "player" && attacker != targ && attacker.health > 2) { // Savage: vampire mode - if(g_vampire && !g_minstagib) + if (g_vampire) + if (!g_minstagib) + if (!g_instagib) + if (time > self.spawnshieldtime) { attacker.health += damage; } -- 2.39.2