Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision 5ae8dcae8f4df3f887075e6fd097ea6d562351fa)
+++ server/server.cpp	(revision 35f60974885addc53d3d4e84bca3007ea9cb618a)
@@ -163,4 +163,5 @@
             if (p->isDead)
             {
+
                if (getCurrentMillis() - p->timeDied >= 10000)
                {
@@ -172,8 +173,8 @@
                   {
                   case 0:// blue team
-                     spawnPos = gameMap->getStructureLocation(WorldMap::STRUCTURE_BLUE_FLAG);
+                     spawnPos = p->currentGame->getMap()->getStructureLocation(WorldMap::STRUCTURE_BLUE_FLAG);
                      break;
                   case 1:// red team
-                     spawnPos = gameMap->getStructureLocation(WorldMap::STRUCTURE_RED_FLAG);
+                     spawnPos = p->currentGame->getMap()->getStructureLocation(WorldMap::STRUCTURE_RED_FLAG);
                      break;
                   default:
@@ -195,7 +196,7 @@
 
                   map<unsigned int, Player*>::iterator it2;
-                  for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++)
-                  {
-                     if ( msgProcessor.sendMessage(&serverMsg, sock, &(p->addr), &outputLog) < 0 )
+                  for (it2 = p->currentGame->getPlayers().begin(); it2 != p->currentGame->getPlayers().end(); it2++)
+                  {
+                     if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second->addr), &outputLog) < 0 )
                         error("sendMessage");
                   }