More protocol changes for rejoin. Re-adding server password to protocol.

2011-10-03 08:03:58 +00:00
parent f8c89304d1
commit aee0adbffe
123 changed files with 766 additions and 535 deletions
@@ -1146,8 +1146,7 @@ ServerGameStateHand::StartNewHand(boost::shared_ptr<ServerGame> server)
 			if (session) {
 				// Set new player id.
 				boost::shared_ptr<PlayerInterface> rejoinPlayer = curGame.getPlayerByName(session->GetPlayerData()->GetName());
-				if (rejoinPlayer)
-				{
+				if (rejoinPlayer) {
 					rejoinPlayer->setMyUniqueID(session->GetPlayerData()->GetUniqueId());
 					rejoinPlayer->setIsConnected(true);
 					boost::shared_ptr<NetPacket> packet(new NetPacket(NetPacket::Alloc));