pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 08:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Expansion] Content Filtering Adjustments (#1910)

Browse Source 
* Change default expansion values for ALL to -1 from 0

* Adjust content_filter_criteria

* Refactor content filtering logic

* Allow flag strings to also just be empty instead of null

* Formatting

* Editor oops
This commit is contained in:
Chris Miles
2022-01-02 20:52:29 -06:00
committed by GitHub
parent c0f57bed1f
commit 9815f50efa
23 changed files with 365 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zone_event_scheduler.cpp
+7 -2
View File
@@ -54,7 +54,7 @@ void ZoneEventScheduler::Process(Zone *zone, WorldContentService *content_servic
auto flag_name = e.event_data;
if (!flag_name.empty()) {
LogScheduler("Deactivating event [{}] resetting content flags", e.description);
content_service->ReloadContentFlags(*m_database);
content_service->ReloadContentFlags();
}
// force active events clear and reapply all active events because we reset the entire state
@@ -117,8 +117,13 @@ void ZoneEventScheduler::Process(Zone *zone, WorldContentService *content_servic
flag_name
);
// add new flag entity to stack
auto flags = content_service->GetContentFlags();
flags.push_back(flag_name);
auto f = ContentFlagsRepository::NewEntity();
f.flag_name = flag_name;
f.enabled = 1;
flags.push_back(f);
content_service->SetContentFlags(flags);
m_active_events.push_back(e);
}