X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=d705fd63abc7e087d701bf448c12e0ed8485cdab;hp=95f28752714a9c322ebfb08ba67cf0ffbcb930e6;hb=63ab06764e6e0a20481ab406863eb7bca32cb669;hpb=0280360295b357680a97a795b9088b5f1a89d13d;ds=sidebyside

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 95f2875271..d705fd63ab 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -910,7 +910,7 @@ void KillIndicator_Think(entity this)
 		ClientKill_Now(this.owner);
 		return;
 	}
-    else if(g_cts && this.health == 1) // health == 1 means that it's silent
+    else if(this.health == 1) // health == 1 means that it's silent
     {
         this.nextthink = time + 1;
         this.cnt -= 1;
@@ -940,11 +940,9 @@ void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change,
 
 	killtime = autocvar_g_balance_kill_delay;
 
-	if(g_race_qualifying || g_cts)
-		killtime = 0;
-
     if(MUTATOR_CALLHOOK(ClientKill, this, killtime))
     	return;
+    killtime = M_ARGV(1, float);
 
 	this.killindicator_teamchange = targetteam;