[Code] WorldContentServer Global to Singleton Cleanup (#4939)

This commit is contained in:
Alex King
2025-06-25 15:55:39 -04:00
committed by GitHub
parent c99bda3f47
commit c0bb32ed12
20 changed files with 156 additions and 156 deletions
+4 -5
View File
@@ -35,7 +35,6 @@
#include "../common/events/player_event_logs.h"
#include "../common/evolving_items.h"
WorldContentService content_service;
PlayerEventLogs player_event_logs;
#ifdef _WINDOWS
@@ -165,16 +164,16 @@ int main(int argc, char **argv)
}
content_service.SetCurrentExpansion(RuleI(Expansion, CurrentExpansion));
content_service.SetDatabase(&database)
WorldContentService::Instance()->SetCurrentExpansion(RuleI(Expansion, CurrentExpansion));
WorldContentService::Instance()->SetDatabase(&database)
->SetContentDatabase(&content_db)
->SetExpansionContext()
->ReloadContentFlags();
LogInfo(
"Current expansion is [{}] ({})",
content_service.GetCurrentExpansion(),
content_service.GetCurrentExpansionName()
WorldContentService::Instance()->GetCurrentExpansion(),
WorldContentService::Instance()->GetCurrentExpansionName()
);
std::string hotfix_name = "";