Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Commands: Extract bonus lists and item context from provided item link for .additem commands

Browse Source 
Closes #30209
This commit is contained in:
Shauren
2025-01-07 16:46:44 +01:00
parent 039acb20e4
commit f647ff6865
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -1158,8 +1158,14 @@ public:
Optional<std::string_view> const& bonusListIdString, Optional<uint8> itemContextArg)
{
uint32 itemId = 0;
std::vector<int32> bonusListIDs;
ItemContext itemContext = ItemContext::NONE;
if (Hyperlink<::item> const* itemLinkData = std::get_if<Hyperlink<::item>>(&itemArg))
{
itemId = (*itemLinkData)->Item->GetId();
bonusListIDs = (*itemLinkData)->ItemBonusListIDs;
itemContext = static_cast<ItemContext>((*itemLinkData)->Context);
}
else if (uint32 const* itemIdPtr = std::get_if<uint32>(&itemArg))
itemId = *itemIdPtr;
else if (std::string_view const* itemNameText = std::get_if<std::string_view>(&itemArg))
@@ -1192,15 +1198,12 @@ public:
if (count == 0)
count = 1;
std::vector<int32> bonusListIDs;
// semicolon separated bonuslist ids (parse them after all arguments are extracted by strtok!)
if (bonusListIdString)
for (std::string_view token : Trinity::Tokenize(*bonusListIdString, ';', false))
if (Optional<int32> bonusListId = Trinity::StringTo<int32>(token); bonusListId && *bonusListId)
bonusListIDs.push_back(*bonusListId);
ItemContext itemContext = ItemContext::NONE;
if (itemContextArg)
{
itemContext = ItemContext(*itemContextArg);
@@ -1208,6 +1211,9 @@ public:
{
std::vector<int32> contextBonuses = ItemBonusMgr::GetBonusListsForItem(itemId, itemContext);
bonusListIDs.insert(bonusListIDs.begin(), contextBonuses.begin(), contextBonuses.end());
std::ranges::sort(bonusListIDs);
std::ranges::borrowed_subrange_t<std::vector<int>&> removed = std::ranges::unique(bonusListIDs);
bonusListIDs.erase(removed.begin(), removed.end());
}
}