Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision f3dfead98b739313bcd88d2c38f13949ce6fbbef)
+++ client/Client/main.cpp	(revision 306758ef5412fe59b4375b110891389459409b21)
@@ -1098,5 +1098,5 @@
                   mapPlayers[p.getId()] = new Player(p);
 
-               game->addPlayer(mapPlayers[p.getId()], false);
+               game->addPlayer(mapPlayers[p.getId()]);
 
                break;
Index: common/Game.cpp
===================================================================
--- common/Game.cpp	(revision f3dfead98b739313bcd88d2c38f13949ce6fbbef)
+++ common/Game.cpp	(revision 306758ef5412fe59b4375b110891389459409b21)
@@ -43,5 +43,5 @@
 }
 
-bool Game::addPlayer(Player* p, bool serverSide) {
+bool Game::addPlayer(Player* p) {
    if (players.find(p->getId()) == players.end()) {
       players[p->getId()] = p;
@@ -57,9 +57,4 @@
       p->hasBlueFlag = false;
       p->hasRedFlag = false;
-
-      if (serverSide) {
-         // choose a random team (either 0 or 1)
-         p->team = rand() % 2;
-      }
 
       p->currentGame = this;
Index: common/Game.h
===================================================================
--- common/Game.h	(revision f3dfead98b739313bcd88d2c38f13949ce6fbbef)
+++ common/Game.h	(revision 306758ef5412fe59b4375b110891389459409b21)
@@ -49,5 +49,5 @@
 
    map<unsigned int, Player*>& getPlayers();
-   bool addPlayer(Player* p, bool serverSide);
+   bool addPlayer(Player* p);
    bool removePlayer(unsigned int id);
 
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision f3dfead98b739313bcd88d2c38f13949ce6fbbef)
+++ server/server.cpp	(revision 306758ef5412fe59b4375b110891389459409b21)
@@ -779,5 +779,5 @@
 
          map<unsigned int, Player*>& oldPlayers = g->getPlayers();
-         g->addPlayer(p, true);
+         g->addPlayer(p);
          p->team = -1;