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

Post merge fixes

Browse Source
This commit is contained in:
Chris Miles 2025-06-25 15:15:23 -05:00
parent 43e50352a9
commit f42c5358b0
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
queryserv/worldserver.cpp
View File

@ -26,7 +26,6 @@
extern WorldServer worldserver; extern WorldServer worldserver;
extern const queryservconfig *Config; extern const queryservconfig *Config;
extern QSDatabase qs_database; extern QSDatabase qs_database;
extern ZSList zs_list;
WorldServer::WorldServer() WorldServer::WorldServer()
{ {
@ -80,7 +79,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (o->type == ServerReload::Type::Logs) { if (o->type == ServerReload::Type::Logs) {
EQEmuLogSys::Instance()->LoadLogDatabaseSettings(); EQEmuLogSys::Instance()->LoadLogDatabaseSettings();
PlayerEventLogs::Instance()->ReloadSettings(); PlayerEventLogs::Instance()->ReloadSettings();
zs_list.SendPlayerEventLogSettings(); ZSList::Instance()->SendPlayerEventLogSettings();
} }
break; break;

2
queryserv/zonelist.h
View File

@ -6,9 +6,9 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <list> #include <list>
#include "zoneserver.h"
class WorldTCPConnection; class WorldTCPConnection;
class ZoneServer;
class ZSList { class ZSList {
public: public:

2
world/console.cpp
View File

@ -1359,7 +1359,7 @@ void ConsoleWWMarquee(
strn0cpy(wwm->message, message.c_str(), sizeof(wwm->message)); strn0cpy(wwm->message, message.c_str(), sizeof(wwm->message));
zoneserver_list.SendPacket(pack); ZSList::Instance()->SendPacket(pack);
safe_delete(pack); safe_delete(pack);
connection->SendLine(fmt::format("Sent world marquee type {}: {}", type, message)); connection->SendLine(fmt::format("Sent world marquee type {}: {}", type, message));

2
world/main.cpp
View File

@ -413,7 +413,7 @@ int main(int argc, char **argv)
} }
} }
WorldEventScheduler::Instance()->Process(&zoneserver_list); WorldEventScheduler::Instance()->Process(ZSList::Instance());
client_list.Process(); client_list.Process();
guild_mgr.Process(); guild_mgr.Process();