pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-29 12:47:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Loot] Consolidate filtering logic (#4280)

Browse Source 
* [Loot] Consolidate filtering logic

* Log category
This commit is contained in:
Chris Miles
2024-04-20 21:17:38 -05:00
committed by GitHub
parent fcffc6b3d4
commit 4215a3b9d6
2 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zone_loot.cpp
+47
View File
@@ -211,6 +211,21 @@ LoottableRepository::Loottable *Zone::GetLootTable(const uint32 loottable_id)
{
for (auto &e: m_loottables) {
if (e.id == loottable_id) {
if (!content_service.DoesPassContentFiltering(
ContentFlags{
.min_expansion = e.min_expansion,
.max_expansion = e.max_expansion,
.content_flags = e.content_flags,
.content_flags_disabled = e.content_flags_disabled
}
)) {
LogLootDetail(
"Loot table [{}] does not pass content filtering",
loottable_id
);
continue;
}
return &e;
}
}
@@ -234,6 +249,21 @@ LootdropRepository::Lootdrop Zone::GetLootdrop(const uint32 lootdrop_id) const
{
for (const auto &e: m_lootdrops) {
if (e.id == lootdrop_id) {
if (!content_service.DoesPassContentFiltering(
ContentFlags{
.min_expansion = e.min_expansion,
.max_expansion = e.max_expansion,
.content_flags = e.content_flags,
.content_flags_disabled = e.content_flags_disabled
}
)) {
LogLootDetail(
"Lootdrop table [{}] does not pass content filtering",
lootdrop_id
);
continue;
}
return e;
}
}
@@ -246,6 +276,23 @@ std::vector<LootdropEntriesRepository::LootdropEntries> Zone::GetLootdropEntries
std::vector<LootdropEntriesRepository::LootdropEntries> entries = {};
for (const auto &e: m_lootdrop_entries) {
if (e.lootdrop_id == lootdrop_id) {
if (!content_service.DoesPassContentFiltering(
ContentFlags{
.min_expansion = e.min_expansion,
.max_expansion = e.max_expansion,
.content_flags = e.content_flags,
.content_flags_disabled = e.content_flags_disabled
}
)) {
LogLootDetail(
"Lootdrop [{}] Item [{}] ({}) does not pass content filtering",
lootdrop_id,
e.item_id,
database.GetItem(e.item_id) ? database.GetItem(e.item_id)->Name : "Unknown"
);
continue;
}
entries.emplace_back(e);
}
}