X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_quake3.qc;h=44036ade494e9b437934f93438fdd5ead1dab8ab;hp=241b8f76df6cbb85cc53e18a2d2cb3e255005625;hb=960db199ba59b839a5043aa9ee8e801b8ceeb115;hpb=3188aedc78fc6c0f613adbfe8f1297ef5cb6a730

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 241b8f76df..44036ade49 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -47,11 +47,13 @@ void target_init_verify()
 		for(targ = world; (targ = find(targ, targetname, trigger.target)); )
 			if (targ.classname == "target_init" || targ.classname == "target_give" || targ.classname == "target_items")
 			{
-				targ.wait = -2;
+				trigger.wait = 0;
+				trigger.delay = 0;
+				targ.wait = 0;
 				targ.delay = 0;
 
-				setsize(targ, trigger.mins, trigger.maxs);
-				setorigin(targ, trigger.origin);
+				//setsize(targ, trigger.mins, trigger.maxs);
+				//setorigin(targ, trigger.origin);
 				//remove(trigger);
 			}
 }
@@ -59,7 +61,7 @@ void target_init_verify()
 void spawnfunc_target_init()
 {
 	self.spawnflags = 0; // remove all weapons except the ones listed below
-	self.netname = "laser uzi"; // keep these weapons through the remove trigger
+	self.netname = "shotgun"; // keep these weapons through the remove trigger
 	spawnfunc_target_items();
 	InitializeEntity(self, target_init_verify, INITPRIO_FINDTARGET);
 }
@@ -98,7 +100,9 @@ void target_give_init()
 			self.armorvalue = 100;
 		else if (targ.classname == "item_health_mega")
 			self.health = 200;
-		remove(targ);
+		//remove(targ); // removing ents in init functions causes havoc, workaround:
+        targ.think = SUB_Remove;
+        targ.nextthink = time;
 	}
 	self.spawnflags = 2;
 	spawnfunc_target_items();