pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-02 06:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reload crash fix

Browse Source
This commit is contained in:
Akkadius 2025-03-02 22:55:27 -06:00
parent 7c242723f4
commit 96e1e76306
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zone/main.cpp
View File

@ -599,6 +599,7 @@ int main(int argc, char **argv)
if (worldserver.Connected()) { if (worldserver.Connected()) {
worldwasconnected = true; worldwasconnected = true;
worldserver.Process();
} }
else { else {
if (worldwasconnected && is_zone_loaded) { if (worldwasconnected && is_zone_loaded) {

1
zone/worldserver.cpp
View File

@ -81,7 +81,6 @@ WorldServer::WorldServer()
cur_groupid = 0; cur_groupid = 0;
last_groupid = 0; last_groupid = 0;
oocmuted = false; oocmuted = false;
m_process_timer = std::make_unique<EQ::Timer>(1000, true, std::bind(&WorldServer::Process, this));
} }
WorldServer::~WorldServer() { WorldServer::~WorldServer() {

1
zone/worldserver.h
View File

@ -81,7 +81,6 @@ private:
ZoneEventScheduler *m_zone_scheduler; ZoneEventScheduler *m_zone_scheduler;
// server reload queue // server reload queue
std::unique_ptr<EQ::Timer> m_process_timer;
std::mutex m_reload_mutex = {}; std::mutex m_reload_mutex = {};
std::map<int, ServerReload::Request> m_reload_queue = {}; std::map<int, ServerReload::Request> m_reload_queue = {};
public: public: