r3475 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: lordhavoc
Date: 2008-03-02 10:01:24 -0500 (Sun, 02 Mar 2008)
New Revision: 3475

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
fixed bug where g_vampire healing worked on spawn-shielded players (such
as in g_midair mode)


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-03-02 14:30:10 UTC (rev 3474)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-03-02 15:01:24 UTC (rev 3475)
@@ -542,7 +542,10 @@
 	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;
 		}