Merge pull request #94 from raymondzuo/master

Bug fix: May not have game server to select when multi-servers config…
ketoo · May 11, 2018 · 9d1e400 · 9d1e400
2 parents ded6eb9 + 2e01531
commit 9d1e400
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/NFServer/NFProxyServerNet_ServerPlugin/NFCProxyServerNet_ServerModule.cpp b/NFServer/NFProxyServerNet_ServerPlugin/NFCProxyServerNet_ServerModule.cpp
@@ -280,9 +280,10 @@ void NFCProxyServerNet_ServerModule::OnSelectServerProcess(const NFSOCK nSockInd
 	int nGameID = 0;
     NFMapEx<int, ConnectData>& xServerList = m_pNetClientModule->GetServerList();
     ConnectData* pGameData = xServerList.FirstNude();
-    while (pGameData && NF_SERVER_TYPES::NF_ST_GAME == pGameData->eServerType)
+    while (pGameData)
     {
-        if (ConnectDataState::NORMAL == pGameData->eState)
+        if (ConnectDataState::NORMAL == pGameData->eState
+            && NF_SERVER_TYPES::NF_ST_GAME == pGameData->eServerType)
         {
 			if (pGameData->nWorkLoad < nWorkload)
 			{