diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-04-10 16:38:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-04-10 16:38:50 +0200 |
| commit | 18b36734f6ac235dbb7a37ba46d1c8d09d8171ab (patch) | |
| tree | 2d1644bb656f7caa76bfa831d8042edea072e8a5 | |
| parent | a0d508885000327f23b9c04ed454d513aec91fa1 (diff) | |
Core/Spells: Fixed checking free inventory space for some spells that have bad dbc data
Closes #24423
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index ab1dbdfe57d..3e6de8b9baf 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -6630,13 +6630,17 @@ SpellCastResult Spell::CheckItems(uint32* param1 /*= nullptr*/, uint32* param2 / if (m_spellInfo->Effects[i].ItemType) { + ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(m_spellInfo->Effects[i].ItemType); + if (!itemTemplate) + return SPELL_FAILED_ITEM_NOT_FOUND; + + uint32 createCount = std::clamp<uint32>(m_spellInfo->Effects[i].CalcValue(), 1u, itemTemplate->GetMaxStackSize()); ItemPosCountVec dest; - InventoryResult msg = target->ToPlayer()->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, m_spellInfo->Effects[i].ItemType, m_spellInfo->Effects[i].CalcValue()); + InventoryResult msg = target->ToPlayer()->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, m_spellInfo->Effects[i].ItemType, createCount); if (msg != EQUIP_ERR_OK) { - ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(m_spellInfo->Effects[i].ItemType); /// @todo Needs review - if (itemTemplate && !itemTemplate->ItemLimitCategory) + if (!itemTemplate->ItemLimitCategory) { player->SendEquipError(msg, nullptr, nullptr, m_spellInfo->Effects[i].ItemType); return SPELL_FAILED_DONT_REPORT; |