From 254f3f7f1a88aa2226b8310554f10762c8bdb14c Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Thu, 26 Feb 2026 10:49:18 +0100 Subject: [PATCH] Filter/Fixup * fix criterium related world event:none excluding unspawned entities --- includes/dbtypes/creature.class.php | 2 +- includes/dbtypes/gameobject.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/dbtypes/creature.class.php b/includes/dbtypes/creature.class.php index eb51c495..c9e7947a 100644 --- a/includes/dbtypes/creature.class.php +++ b/includes/dbtypes/creature.class.php @@ -432,7 +432,7 @@ class CreatureListFilter extends Filter { if ($eventIds = DB::Aowow()->selectCol('SELECT `id` FROM ::events WHERE `holidayId` <> 0')) if ($cGuids = DB::World()->selectCol('SELECT DISTINCT `guid` FROM game_event_creature WHERE `eventEntry` IN %in', $eventIds)) - return ['s.guid', $cGuids, '!']; + return [DB::OR, ['s.guid', $cGuids, '!'], ['s.guid', null]]; return [0]; } diff --git a/includes/dbtypes/gameobject.class.php b/includes/dbtypes/gameobject.class.php index e37b0a9d..6ec73205 100644 --- a/includes/dbtypes/gameobject.class.php +++ b/includes/dbtypes/gameobject.class.php @@ -228,7 +228,7 @@ class GameObjectListFilter extends Filter { if ($eventIds = DB::Aowow()->selectCol('SELECT `id` FROM ::events WHERE `holidayId` <> 0')) if ($goGuids = DB::World()->selectCol('SELECT DISTINCT `guid` FROM game_event_gameobject WHERE `eventEntry` IN %in', $eventIds)) - return ['s.guid', $goGuids, '!']; + return [DB::OR, ['s.guid', $goGuids, '!'], ['s.guid', null]]; return [0]; }