X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_jumppads.qc;h=df5788f4c3a0ff251854b2fd9d5235b23b99a073;hb=0fd5e3f9b0204f5e42a29184ceb881bb1125717a;hp=9bb8f7c92034d88e0de65ba2f88e0039ed4f53f5;hpb=715202f719f244160bfc0b004013fa6e1bcc5668;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 9bb8f7c92..df5788f4c 100644
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -127,6 +127,9 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
 
 void trigger_push_touch()
 {
+	if (self.active == ACTIVE_NOT) 
+		return;		
+		
 	// FIXME: add a .float for whether an entity should be tossed by jumppads
 	if (!other.iscreature)
 	if (other.classname != "corpse")
@@ -229,7 +232,6 @@ void trigger_push_touch()
 };
 
 .vector dest;
-
 void trigger_push_findtarget()
 {
 	local entity e;
@@ -287,7 +289,8 @@ void spawnfunc_trigger_push()
 		SetMovedir ();
 
 	EXACTTRIGGER_INIT;
-
+	
+	self.active = ACTIVE_ACTIVE;	
 	self.use = trigger_push_use;
 	self.touch = trigger_push_touch;