Browse Source

Make World Server reconnect to LS despite FatalError

never disable retry attempts to connect to LS from world
Image 4 years ago
parent
commit
30761b52eb
1 changed files with 6 additions and 2 deletions
  1. 6 2
      EQ2/source/WorldServer/LoginServer.cpp

+ 6 - 2
EQ2/source/WorldServer/LoginServer.cpp

@@ -184,8 +184,8 @@ bool LoginServer::Process() {
 			{
 				LogWrite(OPCODE__DEBUG, 1, "Opcode", "Opcode 0x%X (%i): ServerOP_LSFatalError", pack->opcode, pack->opcode);
 
-				LogWrite(WORLD__ERROR, 0, "World", "Login Server returned a fatal error: %s\nDisabling reconnect.", pack->pBuffer);
-				pTryReconnect = false;
+				LogWrite(WORLD__ERROR, 0, "World", "Login Server returned a fatal error: %s\n", pack->pBuffer);
+				tcpc->Disconnect();
 				ret = false;
 				break;
 			}
@@ -448,6 +448,10 @@ bool LoginServer::Process() {
 			}
 		}
 		safe_delete(pack);
+
+		// break out if ret is now false
+		if (!ret)
+			break;
 	}
 	return ret;
 }