Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision 3476207091fdaa1074da644c2170fc7a8a140202)
+++ server/server.cpp	(revision f15d6a94bdedf0a57354d8776b721a3fff27b731)
@@ -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:
       {