Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision dfc81f0e254acefec87ebeabb304291ff1a1485f)
+++ server/server.cpp	(revision b1ce08cb4577b01b6703c84fcf501e916eeb0606)
@@ -718,5 +718,6 @@
 
          map<unsigned int, Player*>& oldPlayers = g->getPlayers();
-         g->addPlayer(p);
+         g->addPlayer(p, true);
+         p->team = -1;
 
          // send info to other players
@@ -752,4 +753,17 @@
          break;
       }
+      case MSG_TYPE_JOIN_TEAM:
+      {
+         cout << "Received a JOIN_TEAM message" << endl;
+
+         Player* p = findPlayerByAddr(mapPlayers, from);
+         map<unsigned int, Player*> players = p->currentGame->getPlayers();
+
+         memcpy(&(p->team), clientMsg.buffer, 4);
+
+         serverMsg.type = MSG_TYPE_PLAYER;
+         p->serialize(serverMsg.buffer);
+         msgProcessor.broadcastMessage(serverMsg, players);
+      }
       default:
       {