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

[Spawns] Fixes a rarer issue where spawn2 is not being properly content filtered

Browse Source
This commit is contained in:
Chris Miles 2023-08-12 22:28:40 -05:00 committed by Akkadius
parent c3d41e08f4
commit 140aba9f69
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/spawn2.cpp
View File

@ -26,6 +26,7 @@
#include "worldserver.h" #include "worldserver.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;
@ -467,7 +468,7 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
LogInfo("Loaded [{}] respawn timer(s)", Strings::Commify(results.RowCount())); LogInfo("Loaded [{}] respawn timer(s)", Strings::Commify(results.RowCount()));
const char *zone_name = ZoneName(zoneid); const char *zone_name = ZoneName(zoneid);
std::string query = StringFormat( std::string query = fmt::format(
"SELECT " "SELECT "
"id, " "id, "
"spawngroupID, " "spawngroupID, "
@ -485,7 +486,8 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
"animation " "animation "
"FROM " "FROM "
"spawn2 " "spawn2 "
"WHERE zone = '%s' AND (version = %u OR version = -1)", "WHERE TRUE {} AND zone = '{}' AND (version = {} OR version = -1) ",
ContentFilterCriteria::apply(),
zone_name, zone_name,
version version
); );