Index: common/Game.cpp
===================================================================
--- common/Game.cpp	(revision c6665186c331243bcebc907e90b2f7a49eb68d6e)
+++ 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 c6665186c331243bcebc907e90b2f7a49eb68d6e)
+++ 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);