Core/Spells: Don't set CAST_FLAG_PENDING for spells that have OriginalCastID set but no triggered flag
* Fixes cast bar and model animations
This commit is contained in:
@@ -4767,7 +4767,7 @@ void Spell::SendSpellStart()
|
|||||||
if (schoolImmunityMask || mechanicImmunityMask)
|
if (schoolImmunityMask || mechanicImmunityMask)
|
||||||
castFlags |= CAST_FLAG_IMMUNITY;
|
castFlags |= CAST_FLAG_IMMUNITY;
|
||||||
|
|
||||||
if ((IsTriggered() && !m_spellInfo->IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell)
|
if ((!m_fromClient && (_triggeredCastFlags & TRIGGERED_IS_TRIGGERED_MASK) != 0 && !m_spellInfo->IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell)
|
||||||
castFlags |= CAST_FLAG_PENDING;
|
castFlags |= CAST_FLAG_PENDING;
|
||||||
|
|
||||||
if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR10_USES_RANGED_SLOT_COSMETIC_ONLY) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA))
|
if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR10_USES_RANGED_SLOT_COSMETIC_ONLY) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA))
|
||||||
@@ -4866,7 +4866,7 @@ void Spell::SendSpellGo()
|
|||||||
uint32 castFlags = CAST_FLAG_UNKNOWN_9;
|
uint32 castFlags = CAST_FLAG_UNKNOWN_9;
|
||||||
|
|
||||||
// triggered spells with spell visual != 0
|
// triggered spells with spell visual != 0
|
||||||
if ((IsTriggered() && !m_spellInfo->IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell)
|
if ((!m_fromClient && (_triggeredCastFlags & TRIGGERED_IS_TRIGGERED_MASK) != 0 && !m_spellInfo->IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell)
|
||||||
castFlags |= CAST_FLAG_PENDING;
|
castFlags |= CAST_FLAG_PENDING;
|
||||||
|
|
||||||
if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR10_USES_RANGED_SLOT_COSMETIC_ONLY) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA))
|
if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR10_USES_RANGED_SLOT_COSMETIC_ONLY) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA))
|
||||||
|
|||||||
Reference in New Issue
Block a user