Minor tweaks, prepping for a merge

server/server_connections.cpp

@@ -46,15 +46,12 @@ void ServerApplication::HandleJoinRequest(SerialPacket packet) {
 	ClientData newClient;
 	newClient.address = packet.meta.srcAddress;
 
-	//debug
+	//load the user account
 	int uid = LoadUserAccount(packet.clientInfo.username, ClientData::uidCounter);
 	if (uid < 0) {
 		std::cerr << "Error: Account already loaded: " << uid << std::endl;
 		return;
 	}
-	accountMap[uid].blackListed = true;
-	accountMap[uid].whiteListed = false;
-	SaveUserAccount(uid);
 
 	//TODO: move this into the character management code
 	//create the new character