r2786 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-07-07 12:21:43 -0400 (Sat, 07 Jul 2007)
New Revision: 2786

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
Log:
keyhunt/runematch: fix objects not expiring in rapidly firing trigger_hurt boxes (like on dastower40)


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2007-07-07 12:24:17 UTC (rev 2785)
+++ trunk/data/qcsrc/server/g_triggers.qc	2007-07-07 16:21:43 UTC (rev 2786)
@@ -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)