X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Frace.qc;h=9817b3b0e1afaa45675b4755f45989da50afe0d6;hb=57c2420916f58ef57b78062b070c3645b1872695;hp=80a379aa1f806090f170ceb4586d738cb19d06c9;hpb=6dac08025d0ee0e26007b045167b6484598cf429;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index 80a379aa1..9817b3b0e 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -308,7 +308,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid)
 					race_setTime(GetMapname(), t, e.crypto_idfp, e.netname, e);
 					if(g_cts && autocvar_g_cts_finish_kill_delay)
 					{
-						CTS_ClientKill(autocvar_g_cts_finish_kill_delay);
+						CTS_ClientKill(e);
 					}
 				}
 				if(t < recordtime || recordtime == 0)
@@ -742,11 +742,21 @@ void trigger_race_checkpoint_verify()
 		for(trigger = world; (trigger = find(trigger, classname, "trigger_multiple")); )
 			for(targ = world; (targ = find(targ, targetname, trigger.target)); )
 				if (targ.classname == "target_checkpoint" || targ.classname == "target_startTimer" || targ.classname == "target_stopTimer") {
-					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);
+                    // These just make the game crash on some maps with oddly shaped triggers. 
+                    // (on the other hand they used to fix the case when two players ran through a checkpoint at once, 
+                    // and often one of them just passed through without being registered. Hope it's fixed  in a better way now.
+                    // (happened on item triggers too)
+                    //
+					//targ.wait = -2;
+					//targ.delay = 0;
+
+					//setsize(targ, trigger.mins, trigger.maxs);
+					//setorigin(targ, trigger.origin);
 					//remove(trigger);
 				}
 	}