From 96e1e76306059fc2a624e0152eca4beaee49a0f8 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 2 Mar 2025 22:55:27 -0600 Subject: [PATCH] Reload crash fix --- zone/main.cpp | 1 + zone/worldserver.cpp | 1 - zone/worldserver.h | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/zone/main.cpp b/zone/main.cpp index ff68fd010..b947d87c4 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -599,6 +599,7 @@ int main(int argc, char **argv) if (worldserver.Connected()) { worldwasconnected = true; + worldserver.Process(); } else { if (worldwasconnected && is_zone_loaded) { diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 9c0950b47..45889b380 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -81,7 +81,6 @@ WorldServer::WorldServer() cur_groupid = 0; last_groupid = 0; oocmuted = false; - m_process_timer = std::make_unique(1000, true, std::bind(&WorldServer::Process, this)); } WorldServer::~WorldServer() { diff --git a/zone/worldserver.h b/zone/worldserver.h index d54731758..2e92169a5 100644 --- a/zone/worldserver.h +++ b/zone/worldserver.h @@ -81,7 +81,6 @@ private: ZoneEventScheduler *m_zone_scheduler; // server reload queue - std::unique_ptr m_process_timer; std::mutex m_reload_mutex = {}; std::map m_reload_queue = {}; public: