pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-05 19:32:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Databuckets] Fix rarer same bucket name scoping overlap issue (#3509)

Browse Source
This commit is contained in:
Chris Miles 2023-07-19 23:49:11 -05:00 committed by GitHub
parent 2d61cd2b9a
commit 81cee49ea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zone/data_bucket.cpp
View File

@ -194,12 +194,23 @@ std::string DataBucket::GetScopedDbFilters(const DataBucketKey &k)
if (k.character_id > 0) { if (k.character_id > 0) {
query.emplace_back(fmt::format("character_id = {}", k.character_id)); 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)); 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)); query.emplace_back(fmt::format("bot_id = {}", k.bot_id));
} }
else {
query.emplace_back("bot_id = 0");
}
return fmt::format( return fmt::format(
"{} {}", "{} {}",