X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=06fbb72895acf2cfd9628d30f1241d0cb329a89f;hp=f08ef5f5385b7b9dad3eb90bd06a86efbbff21db;hb=6af4e73de035e6bbed9ba2d60e0768c43dc66f2a;hpb=b8aa1648694011379b5b1ec22b5708684381fabc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index f08ef5f538..06fbb72895 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1354,8 +1354,9 @@ void FixClientCvars(entity e)
 	if(g_race || g_cts)
 		stuffcmd(e, "cl_cmd settemp cl_movecliptokeyboard 2\n");
 	if(cvar("g_antilag") == 3) // client side hitscan
-		//stuffcmd(e, "cl_cmd settemp cl_prydoncursor -1\ncl_cmd settemp cl_prydoncursor_notrace 0\n");
 		stuffcmd(e, "cl_cmd settemp cl_prydoncursor_notrace 0\n");
+	if(sv_gentle)
+		stuffcmd(e, "cl_cmd settemp cl_gentle 1\n");
 	/*
 	 * we no longer need to stuff this. Remove this comment block if you feel
 	 * 2.3 and higher (or was it 2.2.3?) don't need these any more
@@ -1386,10 +1387,6 @@ Called when a client connects to the server
 string ColoredTeamName(float t);
 void DecodeLevelParms (void);
 //void dom_player_join_team(entity pl);
-#ifdef UID
-.float uid_kicktime;
-.string uid;
-#endif
 void ClientConnect (void)
 {
 	float t;
@@ -1567,12 +1564,6 @@ void ClientConnect (void)
 	else
 		self.hitplotfh = -1;
 
-#ifdef UID
-	if(clienttype(self) == CLIENTTYPE_REAL)
-	if not(self.uid)
-		self.uid_kicktime = time + 60;
-#endif
-
 	if(g_race || g_cts) {
 		string rr;
 		if(g_cts)
@@ -1593,7 +1584,7 @@ void ClientConnect (void)
 			race_SendRankings(i, 0, 0, MSG_ONE);
 		}
 	}
-	else if(cvar("sv_teamnagger") && !g_ca) // teamnagger is currently bad for ca
+	else if(cvar("sv_teamnagger") && !(cvar("bot_vs_human") && (c3==-1 && c4==-1)) && !g_ca) // teamnagger is currently bad for ca
 		send_CSQC_teamnagger();
 
 	CheatInitClient();
@@ -2856,9 +2847,16 @@ float isInvisibleString(string s)
 		switch(c)
 		{
 			case 0:
-			case 32:
-			case 160:
+			case 32: // space
 				break;
+			case 192: // charmap space
+				if (!cvar("utf8_enable"))
+					break;
+				return FALSE;
+			case 160: // space in unicode fonts
+			case 0xE000 + 192: // utf8 charmap space
+				if (cvar("utf8_enable"))
+					break;
 			default:
 				return FALSE;
 		}
@@ -2903,16 +2901,6 @@ void PlayerPostThink (void)
 		self.stat_count -= 1;
 	}
 
-#ifdef UID
-	if(self.uid_kicktime)
-	if(time > self.uid_kicktime)
-	{
-		bprint("^3", self.netname, "^3 was kicked for missing UID.\n");
-		dropclient(self);
-		return;
-	}
-#endif
-
 	if(sv_maxidle && frametime)
 	{
 		// WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero).