josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Globals: revert back to unordered_map for templates

Browse Source 
Partial revert of commit b64c5043140dc7b7908e259e441de16cc0261320
See discussion on https://github.com/TrinityCore/TrinityCore/commit/b64c5043140dc7b7908e259e441de16cc0261320

(cherry picked from commit b75ff7d4bf13fb4778843c99521223becc096ca0)
This commit is contained in:
ariel-
2021-06-16 01:29:25 +02:00
committed by Shauren
parent 21556667c1
commit 3bc3b3eeeb
11 changed files with 182 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_misc.cpp
+7 -7
View File
@@ -1440,24 +1440,24 @@ public:
bool found = false;
ItemTemplateContainer const& its = sObjectMgr->GetItemTemplateStore();
for (auto const& itemTemplate : its)
for (auto const& itemTemplatePair : its)
{
if (!itemTemplate || itemTemplate->GetItemSet() != itemSetId)
if (itemTemplatePair.second.GetItemSet() != itemSetId)
continue;
found = true;
ItemPosCountVec dest;
InventoryResult msg = playerTarget->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemTemplate->GetId(), 1);
InventoryResult msg = playerTarget->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, itemTemplatePair.first, 1);
if (msg == EQUIP_ERR_OK)
{
std::vector<int32> bonusListIDsForItem = bonusListIDs; // copy, bonuses for each depending on context might be different for each item
if (itemContext != ItemContext::NONE && itemContext < ItemContext::Max)
{
std::set<uint32> contextBonuses = sDB2Manager.GetDefaultItemBonusTree(itemTemplate->GetId(), itemContext);
std::set<uint32> contextBonuses = sDB2Manager.GetDefaultItemBonusTree(itemTemplatePair.first, itemContext);
bonusListIDsForItem.insert(bonusListIDsForItem.begin(), contextBonuses.begin(), contextBonuses.end());
}
Item* item = playerTarget->StoreNewItem(dest, itemTemplate->GetId(), true, {}, GuidSet(), itemContext, bonusListIDsForItem);
Item* item = playerTarget->StoreNewItem(dest, itemTemplatePair.first, true, {}, GuidSet(), itemContext, bonusListIDsForItem);
// remove binding (let GM give it to another player later)
if (player == playerTarget)
@@ -1469,8 +1469,8 @@ public:
}
else
{
player->SendEquipError(msg, nullptr, nullptr, itemTemplate->GetId());
handler->PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemTemplate->GetId(), 1);
player->SendEquipError(msg, nullptr, nullptr, itemTemplatePair.first);
handler->PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemTemplatePair.first, 1);
}
}