r2788 - branches/nexuiz-2.0/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-07-13 14:58:15 -0400 (Fri, 13 Jul 2007)
New Revision: 2788

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
Log:
fix pain_finished bug


Modified: branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2007-07-08 10:44:20 UTC (rev 2787)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2007-07-13 18:58:15 UTC (rev 2788)
@@ -347,9 +347,9 @@
 	if (!other.owner)
 	{
 		if (other.items & IT_KEY1 || other.items & IT_KEY2)	// reset flag
-			other.pain_finished = time + 2;
+			other.pain_finished = min(other.pain_finished, time + 2);
 		else if (other.classname == "rune")			// reset runes
-			other.nextthink = time + 1;
+			other.nextthink = min(other.nextthink, time + 1);
 	}
 
 	if (other.takedamage)