diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-04-10 16:38:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-01 13:28:04 +0100 |
| commit | ba69c91f4bfec9999d151ef42f0b522924496264 (patch) | |
| tree | 0f0b03e113ccc659fa3e37462bcaa9296ee18e2b | |
| parent | a020c4ad7cd4e20b4c836a70e39fe87747d81e28 (diff) | |
Core/Spells: Fixed checking free inventory space for some spells that have bad dbc data
Closes #24423
(cherry picked from commit 18b36734f6ac235dbb7a37ba46d1c8d09d8171ab)
| -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 bc2ac5835c3..eec48f5e6df 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -6985,13 +6985,17 @@ SpellCastResult Spell::CheckItems(int32* param1 /*= nullptr*/, int32* param2 /*= if (spellEffectInfo.ItemType) { + ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(spellEffectInfo.ItemType); + if (!itemTemplate) + return SPELL_FAILED_ITEM_NOT_FOUND; + + uint32 createCount = std::clamp<uint32>(spellEffectInfo.CalcValue(), 1u, itemTemplate->GetMaxStackSize()); ItemPosCountVec dest; - InventoryResult msg = target->ToPlayer()->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, spellEffectInfo.ItemType, spellEffectInfo.CalcValue()); + InventoryResult msg = target->ToPlayer()->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, spellEffectInfo.ItemType, createCount); if (msg != EQUIP_ERR_OK) { - ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(spellEffectInfo.ItemType); /// @todo Needs review - if (itemTemplate && !itemTemplate->GetItemLimitCategory()) + if (!itemTemplate->GetItemLimitCategory()) { player->SendEquipError(msg, nullptr, nullptr, spellEffectInfo.ItemType); return SPELL_FAILED_DONT_REPORT; |