From 358735aadb951c8508e9a9872cbd3a132b23a942 Mon Sep 17 00:00:00 2001 From: heinrich5991 Date: Wed, 1 Jul 2020 17:45:01 +0200 Subject: [PATCH] Revert "Don't run UpdateServerInfo if server isn't initialized yet" This reverts commit e69f747e5fc00ec19add95946055c7288ececb91. Fixes `shutdown` on the initial command line which is also used on CI. --- src/engine/server/server.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 61b200b37..ea222886a 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -273,7 +273,7 @@ CServer::CServer(): m_Register(false), m_RegSixup(true) m_pGameServer = 0; m_CurrentGameTick = 0; - m_RunServer = false; + m_RunServer = 1; for(int i = 0; i < 2; i++) { @@ -2075,9 +2075,6 @@ void CServer::ExpireServerInfo() void CServer::UpdateServerInfo(bool Resend) { - if(!m_RunServer) - return; - for(int i = 0; i < 3; i++) for(int j = 0; j < 2; j++) CacheServerInfo(&m_ServerInfoCache[i * 2 + j], i, j); @@ -2295,8 +2292,6 @@ void CServer::InitRegister(CNetServer *pNetServer, IEngineMasterServer *pMasterS int CServer::Run() { - m_RunServer = true; - m_AuthManager.Init(); if(g_Config.m_Debug)