public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): Disarmed creatures should no cast spells that requi… (#7171)

Browse Source 
* fix(Core/Spells): Disarmed creatures should no cast spells that requires weapon.

Fixed #6404
Fixed #6764.

* codestyle.

Co-authored-by: Stefano Borzì <stefanoborzi32@gmail.com>
This commit is contained in:
UltraNix
2021-08-05 22:41:51 +02:00
committed by GitHub
parent 7e6727c12a
commit 5a93dce915
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/Spells/Spell.cpp
View File

@@ -6518,6 +6518,12 @@ SpellCastResult Spell::CheckItems()
Player* player = m_caster->ToPlayer(); Player* player = m_caster->ToPlayer();
if (!player) if (!player)
{ {
// Non-player case: Check if creature is disarmed
if (!m_caster->CanUseAttackType(m_attackType) && (m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE || m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED))
{
return SPELL_FAILED_EQUIPPED_ITEM_CLASS;
}
return SPELL_CAST_OK; return SPELL_CAST_OK;
} }
@@ -7048,11 +7054,11 @@ SpellCastResult Spell::CheckItems()
// skip spell if no weapon in slot or broken // skip spell if no weapon in slot or broken
if (!item || item->IsBroken()) if (!item || item->IsBroken())
return SPELL_FAILED_EQUIPPED_ITEM_CLASS; return SPELL_FAILED_EQUIPPED_ITEM_CLASS_MAINHAND;
// skip spell if weapon not fit to triggered spell // skip spell if weapon not fit to triggered spell
if (!item->IsFitToSpellRequirements(m_spellInfo)) if (!item->IsFitToSpellRequirements(m_spellInfo))
return SPELL_FAILED_EQUIPPED_ITEM_CLASS; return SPELL_FAILED_EQUIPPED_ITEM_CLASS_MAINHAND;
} }
// offhand hand weapon required // offhand hand weapon required
@@ -7062,11 +7068,11 @@ SpellCastResult Spell::CheckItems()
// skip spell if no weapon in slot or broken // skip spell if no weapon in slot or broken
if (!item || item->IsBroken()) if (!item || item->IsBroken())
return SPELL_FAILED_EQUIPPED_ITEM_CLASS; return SPELL_FAILED_EQUIPPED_ITEM_CLASS_OFFHAND;
// skip spell if weapon not fit to triggered spell // skip spell if weapon not fit to triggered spell
if (!item->IsFitToSpellRequirements(m_spellInfo)) if (!item->IsFitToSpellRequirements(m_spellInfo))
return SPELL_FAILED_EQUIPPED_ITEM_CLASS; return SPELL_FAILED_EQUIPPED_ITEM_CLASS_OFFHAND;
} }
} }