diff options
author | Shauren <shauren.trinity@gmail.com> | 2024-08-17 12:40:27 +0200 |
---|---|---|
committer | Ovahlord <dreadkiller@gmx.de> | 2024-08-17 14:05:57 +0200 |
commit | 6051a553ebef51cf1c35b0531de43217d797ab93 (patch) | |
tree | b48126a7a01c4401d87f559ed6f3cf830e7b4af2 /src/server/game/Loot/Loot.cpp | |
parent | bd2212322b848710255028c0439a5984d7657293 (diff) |
Core/Utils: Unwrap non-copyable pointers (unique_ptr) from Trinity::Containers::MapGetValuePtr
(cherry picked from commit edb20999a3b414ebe1b89410f08f2434e8da1cdb)
Diffstat (limited to 'src/server/game/Loot/Loot.cpp')
-rw-r--r-- | src/server/game/Loot/Loot.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Loot/Loot.cpp b/src/server/game/Loot/Loot.cpp index dd4c16e6202..85c831eed59 100644 --- a/src/server/game/Loot/Loot.cpp +++ b/src/server/game/Loot/Loot.cpp @@ -148,13 +148,13 @@ Optional<LootSlotType> LootItem::GetUiTypeForPlayer(Player const* player, Loot c if (freeforall) { - if (std::unique_ptr<NotNormalLootItemList> const* ffaItems = Trinity::Containers::MapGetValuePtr(loot.GetPlayerFFAItems(), player->GetGUID())) + if (NotNormalLootItemList const* ffaItems = Trinity::Containers::MapGetValuePtr(loot.GetPlayerFFAItems(), player->GetGUID())) { - auto ffaItemItr = std::find_if(ffaItems->get()->begin(), ffaItems->get()->end(), [&](NotNormalLootItem const& ffaItem) + auto ffaItemItr = std::ranges::find_if(*ffaItems, [&](NotNormalLootItem const& ffaItem) { return ffaItem.LootListId == LootListId; }); - if (ffaItemItr != ffaItems->get()->end() && !ffaItemItr->is_looted) + if (ffaItemItr != ffaItems->end() && !ffaItemItr->is_looted) return loot.GetLootMethod() == FREE_FOR_ALL ? LOOT_SLOT_TYPE_OWNER : LOOT_SLOT_TYPE_ALLOW_LOOT; } return {}; @@ -965,9 +965,9 @@ bool Loot::hasItemFor(Player const* player) const if (!lootItem.is_looted && !lootItem.follow_loot_rules && lootItem.GetAllowedLooters().find(player->GetGUID()) != lootItem.GetAllowedLooters().end()) return true; - if (std::unique_ptr<NotNormalLootItemList> const* ffaItems = Trinity::Containers::MapGetValuePtr(GetPlayerFFAItems(), player->GetGUID())) + if (NotNormalLootItemList const* ffaItems = Trinity::Containers::MapGetValuePtr(GetPlayerFFAItems(), player->GetGUID())) { - bool hasFfaItem = std::any_of(ffaItems->get()->begin(), ffaItems->get()->end(), [&](NotNormalLootItem const& ffaItem) + bool hasFfaItem = std::ranges::any_of(*ffaItems, [&](NotNormalLootItem const& ffaItem) { return !ffaItem.is_looted; }); |