From 81cee49ea1b7aa2ea39fbe341592d9b5e4496b9e Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Wed, 19 Jul 2023 23:49:11 -0500 Subject: [PATCH] [Databuckets] Fix rarer same bucket name scoping overlap issue (#3509) --- zone/data_bucket.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/zone/data_bucket.cpp b/zone/data_bucket.cpp index a2951e9df..40f1d1431 100644 --- a/zone/data_bucket.cpp +++ b/zone/data_bucket.cpp @@ -194,12 +194,23 @@ std::string DataBucket::GetScopedDbFilters(const DataBucketKey &k) if (k.character_id > 0) { query.emplace_back(fmt::format("character_id = {}", k.character_id)); } - else if (k.npc_id > 0) { + else { + query.emplace_back("character_id = 0"); + } + + if (k.npc_id > 0) { query.emplace_back(fmt::format("npc_id = {}", k.npc_id)); } - else if (k.bot_id > 0) { + else { + query.emplace_back("npc_id = 0"); + } + + if (k.bot_id > 0) { query.emplace_back(fmt::format("bot_id = {}", k.bot_id)); } + else { + query.emplace_back("bot_id = 0"); + } return fmt::format( "{} {}",