1 files changed, 10 insertions, 0 deletions
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 071a8441..ca002506 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1285,6 +1285,16 @@ char *ClientConnect( int clientNum, qboolean firstTime )
   // count current clients and rank for scoreboard
   CalculateRanks( );
   G_admin_namelog_update( client, qfalse );
+  
+
+  // if this is after !restart keepteams or !restart switchteams, apply said selection
+  if ( client->sess.restartTeam != TEAM_NONE )
+  {
+    G_ChangeTeam( ent, client->sess.restartTeam );
+    client->sess.restartTeam = TEAM_NONE;
+  }
+
+  
   return NULL;
 }