X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclientcommands.qc;h=b705e9c09ce18a1877a3e9889e2130c06a53daa9;hb=2805e22b6636b63410a30e4fec68e1ae5ecadc87;hp=8fc949fa412f49ea70263db21c7f5066ef9a55a8;hpb=b49d3f3ffff847ec761e15fcc6285a736cddcba3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index 8fc949fa4..b705e9c09 100644
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -182,16 +182,6 @@ void SV_ParseClientCommand(string s) {
 			tokens = tokenize_console(s);
 		}
 		GetCvars(1);
-#ifdef UID
-	} else if(cmd == "uid") {
-		if not(self.uid)
-		{
-			self.uid = strzone(argv(1));
-			self.uid_kicktime = 0;
-			print("Client ", etos(self), " has UID ", self.uid, "\n");
-			Ban_MaybeEnforceBan(self);
-		}
-#endif
 	} else if(cmd == "sentcvar") { // new system
 		if(tokens == 2) // undefined cvar: use the default value on the server then
 		{
@@ -225,7 +215,6 @@ void SV_ParseClientCommand(string s) {
 				DropFlag(self.flagcarried, world, world);
 			if(self.ballcarried)
 				DropBall(self.ballcarried, self.origin, self.velocity);
-			kh_Key_DropAll(self, TRUE);
 			WaypointSprite_PlayerDead();
 			self.classname = "observer";
 			if(g_ca)
@@ -441,7 +430,7 @@ void ReadyRestartForce()
 
 	readyrestart_happened = 1;
 	game_starttime = time;
-	if(!g_ca)
+	if(!g_ca && !g_arena)
 		game_starttime += RESTART_COUNTDOWN;
 	restart_mapalreadyrestarted = 0; //reset this var, needed when cvar sv_ready_restart_repeatable is in use
 
@@ -459,7 +448,7 @@ void ReadyRestartForce()
 	}
 
 	//initiate the restart-countdown-announcer entity
-	if(cvar("sv_ready_restart_after_countdown"))
+	if(cvar("sv_ready_restart_after_countdown") && !g_ca && !g_arena)
 	{
 		restartTimer = spawn();
 		restartTimer.think = restartTimer_Think;
@@ -487,7 +476,7 @@ void ReadyRestart()
 	if(g_arena | g_assault | gameover | intermission_running | race_completing)
 		localcmd("restart\n");
 	else
-		localcmd("\nsv_hook_gamerestart;");
+		localcmd("\nsv_hook_gamerestart\n");
 
 	ReadyRestartForce();