[Code] PlayerEventLogs Global to Singleton Cleanup (#4928)

* [Code] PlayerEventLogs Global to Singleton Cleanup

* Fix

---------

Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King
2025-06-25 16:05:33 -04:00
committed by GitHub
parent c0bb32ed12
commit 643ee56433
41 changed files with 95 additions and 106 deletions
+2 -3
View File
@@ -28,7 +28,6 @@ Database database;
std::string WorldShortName;
const queryservconfig *Config;
WorldServer *worldserver = 0;
PlayerEventLogs player_event_logs;
ZSList zs_list;
uint32 numzones = 0;
@@ -156,7 +155,7 @@ int main()
LFGuildManager::Instance()->LoadDatabase();
Timer player_event_process_timer(1000);
player_event_logs.SetDatabase(&qs_database)->Init();
PlayerEventLogs::Instance()->SetDatabase(&qs_database)->Init();
auto loop_fn = [&](EQ::Timer *t) {
Timer::SetCurrentTime();
@@ -171,7 +170,7 @@ int main()
}
if (player_event_process_timer.Check()) {
player_event_logs.Process();
PlayerEventLogs::Instance()->Process();
}
};
+1 -1
View File
@@ -79,7 +79,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
auto o = (ServerReload::Request*) p.Data();
if (o->type == ServerReload::Type::Logs) {
EQEmuLogSys::Instance()->LoadLogDatabaseSettings();
player_event_logs.ReloadSettings();
PlayerEventLogs::Instance()->ReloadSettings();
zs_list.SendPlayerEventLogSettings();
}
+3 -3
View File
@@ -33,7 +33,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
cereal::BinaryInputArchive archive(ss);
archive(n);
player_event_logs.AddToQueue(n.player_event_log);
PlayerEventLogs::Instance()->AddToQueue(n.player_event_log);
DiscordManager::Instance()->QueuePlayerEventMessage(n);
break;
@@ -49,8 +49,8 @@ void ZoneServer::SendPlayerEventLogSettings()
{
EQ::Net::DynamicPacket dyn_pack;
std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings> settings(
player_event_logs.GetSettings(),
player_event_logs.GetSettings() + PlayerEvent::EventType::MAX
PlayerEventLogs::Instance()->GetSettings(),
PlayerEventLogs::Instance()->GetSettings() + PlayerEvent::EventType::MAX
);
dyn_pack.PutSerialize(0, settings);