mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 04:37:00 +00:00
Cast 61987 also with 25771 as precasts.
Signed-off-by: ApoC <apoc@nymfe.net>
This commit is contained in:
parent
6002d7ea2c
commit
afdfa4f564
1 changed files with 16 additions and 2 deletions
|
|
@ -2322,7 +2322,12 @@ void Spell::cast(bool skipCheck)
|
||||||
{
|
{
|
||||||
// Divine Shield, Divine Protection or Hand of Protection
|
// Divine Shield, Divine Protection or Hand of Protection
|
||||||
if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000400080))
|
if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000400080))
|
||||||
|
{
|
||||||
AddPrecastSpell(25771); // Forbearance
|
AddPrecastSpell(25771); // Forbearance
|
||||||
|
AddPrecastSpell(61987); // Avenging Wrath Marker
|
||||||
|
}
|
||||||
|
else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x200000000000))
|
||||||
|
AddPrecastSpell(61987); // Avenging Wrath Marker
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SPELLFAMILY_SHAMAN:
|
case SPELLFAMILY_SHAMAN:
|
||||||
|
|
@ -3666,8 +3671,17 @@ SpellCastResult Spell::CheckCast(bool strict)
|
||||||
// Caster aura req check if need
|
// Caster aura req check if need
|
||||||
if(m_spellInfo->casterAuraSpell && !m_caster->HasAura(m_spellInfo->casterAuraSpell))
|
if(m_spellInfo->casterAuraSpell && !m_caster->HasAura(m_spellInfo->casterAuraSpell))
|
||||||
return SPELL_FAILED_CASTER_AURASTATE;
|
return SPELL_FAILED_CASTER_AURASTATE;
|
||||||
if(m_spellInfo->excludeCasterAuraSpell && m_caster->HasAura(m_spellInfo->excludeCasterAuraSpell))
|
if(m_spellInfo->excludeCasterAuraSpell)
|
||||||
|
{
|
||||||
|
// Special cases of non existing auras handling
|
||||||
|
if(m_spellInfo->excludeCasterAuraSpell == 61988)
|
||||||
|
{
|
||||||
|
if(m_caster->HasAura(61987))
|
||||||
return SPELL_FAILED_CASTER_AURASTATE;
|
return SPELL_FAILED_CASTER_AURASTATE;
|
||||||
|
}
|
||||||
|
else if(m_caster->HasAura(m_spellInfo->excludeCasterAuraSpell))
|
||||||
|
return SPELL_FAILED_CASTER_AURASTATE;
|
||||||
|
}
|
||||||
|
|
||||||
// cancel autorepeat spells if cast start when moving
|
// cancel autorepeat spells if cast start when moving
|
||||||
// (not wand currently autorepeat cast delayed to moving stop anyway in spell update code)
|
// (not wand currently autorepeat cast delayed to moving stop anyway in spell update code)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue