From e044e4dc83b7b28a4ef8b2dc5a077091df3e0d85 Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Fri, 30 Sep 2016 00:37:17 -0500
Subject: [PATCH] will revisit this later... but..

---
 .../src/shared/CentralServer.cpp              | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.cpp b/engine/server/application/CentralServer/src/shared/CentralServer.cpp
index 32394bcd..30e6d470 100755
--- a/engine/server/application/CentralServer/src/shared/CentralServer.cpp
+++ b/engine/server/application/CentralServer/src/shared/CentralServer.cpp
@@ -1371,38 +1371,37 @@ void CentralServer::receiveMessage(const MessageDispatch::Emitter & source, cons
 				m_timeClusterWentIntoLoadingState = time(0);
 			}
 
-			//  handle planet transfers and logins for planet server that aren't up yet
-			std::vector<Archive::ByteStream>::iterator t;
-			for (t = m_messagesWaitingForPlanetServer.begin(); t != m_messagesWaitingForPlanetServer.end();) {
-				Archive::ReadIterator tri = t->begin();
-				const GameNetworkMessage gnm(tri);
-				const uint32 mt = gnm.getType();
-
-				tri = t->begin();
-				switch (mt) {
-					case constcrc("RequestGameServerForLoginMessage") : {
+				//  handle planet transfers and logins for planet server that aren't up yet
+				std::vector<Archive::ByteStream>::iterator t;
+				for(t = m_messagesWaitingForPlanetServer.begin(); t != m_messagesWaitingForPlanetServer.end();)
+				{
+					Archive::ReadIterator tri = t->begin();
+					const GameNetworkMessage gnm(tri);
+					tri = t->begin();
+					if(gnm.isType("RequestGameServerForLoginMessage"))
+					{
 						const RequestGameServerForLoginMessage loginMessage(tri);
-						if (loginMessage.getScene() == msg.getSceneId()) {
+						if (loginMessage.getScene() == msg.getSceneId())
+						{
 							t = m_messagesWaitingForPlanetServer.erase(t);
 							handleRequestGameServerForLoginMessage(loginMessage);
 						}
-						break;
 					}
-					case constcrc("RequestSceneTransfer") : {
+					else if(gnm.isType("RequestSceneTransfer"))
+					{
 						const RequestSceneTransfer sceneMessage(tri);
-						if (sceneMessage.getSceneName() == msg.getSceneId()) {
+						if (sceneMessage.getSceneName() == msg.getSceneId())
+						{
 							t = m_messagesWaitingForPlanetServer.erase(t);
 							handleRequestSceneTransfer(sceneMessage);
 						}
-						break;
 					}
-					default : {
+					else
+					{
 						t = m_messagesWaitingForPlanetServer.erase(t);
 						WARNING_STRICT_FATAL(true, ("Unknown message type waiting for planet server"));
-						break;
 					}
 				}
-			}
 			break;
 		}
 		case constcrc("RequestSceneTransfer") : {