Merge branch 'master' into Lyberta/TeamplayOverhaul2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / client.qc

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 5251ee55f95c38b1327f88a926c78fa4f88e6876..8075ff1e25cd66b7823888783da2276191cadc72 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1263,11 +1263,11 @@ void ClientConnect(entity this)
        TRANSMUTE(Client, this);
        CS(this).version_nagtime = time + 10 + random() * 10;
 
-       Player_DetermineForcedTeam(this);
+       Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_JOIN_CONNECT, this.netname);
+
+       bot_clientconnect(this);
 
-       int playerid_save = this.playerid;
-       this.playerid = 0; // silent
-       this.playerid = playerid_save;
+       Player_DetermineForcedTeam(this);
 
        TRANSMUTE(Observer, this);
 
@@ -1284,11 +1284,6 @@ void ClientConnect(entity this)
 
        CS(this).just_joined = true;  // stop spamming the eventlog with additional lines when the client connects
 
-       if(teamplay && IS_PLAYER(this))
-               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_JOIN_CONNECT_TEAM), this.netname);
-       else
-               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_JOIN_CONNECT, this.netname);
-
        stuffcmd(this, clientstuff, "\n");
        stuffcmd(this, "cl_particles_reloadeffects\n"); // TODO do we still need this?