mirror of
https://github.com/EQEmu/Server.git
synced 2026-01-05 00:03:52 +00:00
Revert "Reload crash fix"
This reverts commit 96e1e76306059fc2a624e0152eca4beaee49a0f8.
This commit is contained in:
parent
96e1e76306
commit
72646cab35
@ -599,7 +599,6 @@ int main(int argc, char **argv)
|
||||
|
||||
if (worldserver.Connected()) {
|
||||
worldwasconnected = true;
|
||||
worldserver.Process();
|
||||
}
|
||||
else {
|
||||
if (worldwasconnected && is_zone_loaded) {
|
||||
|
||||
@ -81,6 +81,7 @@ WorldServer::WorldServer()
|
||||
cur_groupid = 0;
|
||||
last_groupid = 0;
|
||||
oocmuted = false;
|
||||
m_process_timer = std::make_unique<EQ::Timer>(1000, true, std::bind(&WorldServer::Process, this));
|
||||
}
|
||||
|
||||
WorldServer::~WorldServer() {
|
||||
|
||||
@ -81,6 +81,7 @@ private:
|
||||
ZoneEventScheduler *m_zone_scheduler;
|
||||
|
||||
// server reload queue
|
||||
std::unique_ptr<EQ::Timer> m_process_timer;
|
||||
std::mutex m_reload_mutex = {};
|
||||
std::map<int, ServerReload::Request> m_reload_queue = {};
|
||||
public:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user