pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add spawn expansion filtering

Browse Source
This commit is contained in:
Akkadius 2020-04-04 06:08:56 -05:00
parent 80baf1b9ed
commit be8a6b6af4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/repositories/criteria/content_filter_criteria.h
View File

@ -47,11 +47,11 @@ namespace ContentFilterCriteria {
std::string flags_in_filter; std::string flags_in_filter;
if (!flags.empty()) { if (!flags.empty()) {
flags_in_filter = fmt::format("OR content_flags IN ({})", implode(", ", flags)); flags_in_filter = fmt::format(" OR content_flags IN ({})", implode(", ", flags));
} }
criteria += fmt::format( criteria += fmt::format(
" AND (content_flags IS NULL {})", " AND (content_flags IS NULL{})",
flags_in_filter flags_in_filter
); );

5
zone/spawngroup.cpp
View File

@ -24,6 +24,7 @@
#include "spawngroup.h" #include "spawngroup.h"
#include "zone.h" #include "zone.h"
#include "zonedb.h" #include "zonedb.h"
#include "../common/repositories/criteria/content_filter_criteria.h"
extern EntityList entity_list; extern EntityList entity_list;
extern Zone *zone; extern Zone *zone;
@ -209,9 +210,11 @@ bool ZoneDatabase::LoadSpawnGroups(const char *zone_name, uint16 version, SpawnG
spawn2.spawngroupID = spawngroup.ID spawn2.spawngroupID = spawngroup.ID
AND AND
spawn2.version = {} and zone = '{}' spawn2.version = {} and zone = '{}'
{}
), ),
version, version,
zone_name zone_name,
ContentFilterCriteria::apply()
); );
auto results = QueryDatabase(query); auto results = QueryDatabase(query);