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

Use local database pointer

Browse Source
This commit is contained in:
Chris Miles
2025-06-27 16:11:05 -05:00
parent 66cc83cb28
commit 7d223ce6f2
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/content/world_content_service.cpp
+5 -3
View File
@@ -320,7 +320,9 @@ bool WorldContentService::DoesZonePassContentFiltering(const ZoneRepository::Zon
return DoesPassContentFiltering(f);
}
void WorldContentService::LoadTargetedRulesets(Database* db)
void WorldContentService::LoadTargetedRulesets()
{
if (!m_zone_id) {
LogError("Zone ID is not set. Cannot load targeted rulesets.");
@@ -331,8 +333,8 @@ void WorldContentService::LoadTargetedRulesets(Database* db)
constexpr int8 EXPANSION_ZERO_VALUE = -2;
auto rules = RuleValuesRepository::GetWhere(*db, "TRUE ORDER BY ruleset_id, rule_name");
auto sets = RuleSetsRepository::GetWhere(*db, "TRUE ORDER BY ruleset_id");
auto rules = RuleValuesRepository::GetWhere(*m_database, "TRUE ORDER BY ruleset_id, rule_name");
auto sets = RuleSetsRepository::GetWhere(*m_database, "TRUE ORDER BY ruleset_id");
for (auto& e : sets) {
bool has_filters =
!e.zone_ids.empty() ||
common/content/world_content_service.h
+2 -2
View File
@@ -82,7 +82,7 @@ namespace Expansion {
"Empires of Kunark",
"Ring of Scale",
"The Burning Lands",
"Torment of Velious",
"Torment of Velious"
};
}
@@ -194,7 +194,7 @@ public:
bool IsInPublicStaticInstance(uint32 instance_id);
// targeted rulesets
void LoadTargetedRulesets(Database* db);
void LoadTargetedRulesets();
inline void SetZoneId(int zone_id) { m_zone_id = zone_id; }
inline void SetInstanceVersion(int instance_version) { m_instance_version = instance_version; }