Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Fixed checking free inventory space for some spells that have bad dbc data

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ba69c91f4bfec9999d151ef42f0b522924496264)
This commit is contained in:
hondacrx
2022-02-17 17:05:24 -05:00
parent c34fe71311
commit 9d4096991c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+9 -4
View File
@@ -6240,13 +6240,18 @@ namespace Game.Spells
if (spellEffectInfo.ItemType != 0) if (spellEffectInfo.ItemType != 0)
{ {
ItemTemplate itemTemplate = Global.ObjectMgr.GetItemTemplate(spellEffectInfo.ItemType);
if (itemTemplate == null)
return SpellCastResult.ItemNotFound;
uint createCount = (uint)Math.Clamp(spellEffectInfo.CalcValue(), 1u, itemTemplate.GetMaxStackSize());
List<ItemPosCount> dest = new(); List<ItemPosCount> dest = new();
InventoryResult msg = target.ToPlayer().CanStoreNewItem(ItemConst.NullBag, ItemConst.NullSlot, dest, spellEffectInfo.ItemType, (uint)spellEffectInfo.CalcValue()); InventoryResult msg = target.ToPlayer().CanStoreNewItem(ItemConst.NullBag, ItemConst.NullSlot, dest, spellEffectInfo.ItemType, createCount);
if (msg != InventoryResult.Ok) if (msg != InventoryResult.Ok)
{ {
ItemTemplate itemTemplate = Global.ObjectMgr.GetItemTemplate(spellEffectInfo.ItemType);
/// @todo Needs review /// @todo Needs review
if (itemTemplate != null && itemTemplate.GetItemLimitCategory() == 0) if (itemTemplate.GetItemLimitCategory() == 0)
{ {
player.SendEquipError(msg, null, null, spellEffectInfo.ItemType); player.SendEquipError(msg, null, null, spellEffectInfo.ItemType);
return SpellCastResult.DontReport; return SpellCastResult.DontReport;
@@ -6256,7 +6261,7 @@ namespace Game.Spells
// Conjure Food/Water/Refreshment spells // Conjure Food/Water/Refreshment spells
if (m_spellInfo.SpellFamilyName != SpellFamilyNames.Mage || (!m_spellInfo.SpellFamilyFlags[0].HasAnyFlag(0x40000000u))) if (m_spellInfo.SpellFamilyName != SpellFamilyNames.Mage || (!m_spellInfo.SpellFamilyFlags[0].HasAnyFlag(0x40000000u)))
return SpellCastResult.TooManyOfItem; return SpellCastResult.TooManyOfItem;
else if (!(target.ToPlayer().HasItemCount(spellEffectInfo.ItemType))) else if (!target.ToPlayer().HasItemCount(spellEffectInfo.ItemType))
{ {
player.SendEquipError(msg, null, null, spellEffectInfo.ItemType); player.SendEquipError(msg, null, null, spellEffectInfo.ItemType);
return SpellCastResult.DontReport; return SpellCastResult.DontReport;