mirror of
https://github.com/mangosfour/server.git
synced 2025-12-21 10:37:06 +00:00
[10649] Enchanted spell 8017 and ranks should apply to weapon by client auto selection
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
09d468e7ab
commit
e87008b339
3 changed files with 15 additions and 22 deletions
|
|
@ -5816,23 +5816,26 @@ SpellCastResult Spell::CheckItems()
|
|||
}
|
||||
}
|
||||
|
||||
// check target item
|
||||
// check target item (for triggered case not report error)
|
||||
if(m_targets.getItemTargetGUID())
|
||||
{
|
||||
if(m_caster->GetTypeId() != TYPEID_PLAYER)
|
||||
return SPELL_FAILED_BAD_TARGETS;
|
||||
return m_IsTriggeredSpell && !(m_targets.m_targetMask & TARGET_FLAG_TRADE_ITEM)
|
||||
? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_BAD_TARGETS;
|
||||
|
||||
if(!m_targets.getItemTarget())
|
||||
return SPELL_FAILED_ITEM_GONE;
|
||||
return m_IsTriggeredSpell && !(m_targets.m_targetMask & TARGET_FLAG_TRADE_ITEM)
|
||||
? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_ITEM_GONE;
|
||||
|
||||
if(!m_targets.getItemTarget()->IsFitToSpellRequirements(m_spellInfo))
|
||||
return SPELL_FAILED_EQUIPPED_ITEM_CLASS;
|
||||
return m_IsTriggeredSpell && !(m_targets.m_targetMask & TARGET_FLAG_TRADE_ITEM)
|
||||
? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_EQUIPPED_ITEM_CLASS;
|
||||
}
|
||||
// if not item target then required item must be equipped
|
||||
// if not item target then required item must be equipped (for triggered case not report error)
|
||||
else
|
||||
{
|
||||
if(m_caster->GetTypeId() == TYPEID_PLAYER && !((Player*)m_caster)->HasItemFitToSpellReqirements(m_spellInfo))
|
||||
return SPELL_FAILED_EQUIPPED_ITEM_CLASS;
|
||||
return m_IsTriggeredSpell ? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_EQUIPPED_ITEM_CLASS;
|
||||
}
|
||||
|
||||
// check spell focus object
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue