Core/Spells: Implemented SPELL_ATTR6_NO_PUSHBACK
This commit is contained in:
1 parent
50235ffcbc
commit
b394faf376
2 files changed
+7
-7
No files matched your search
@@ -963,7 +963,7 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit* excludeCasterChannel) cons
|
||||
|
||||
if (damagetype != NODAMAGE && damagetype != DOT)
|
||||
{
|
||||
if (victim != attacker && (!spellProto || !(spellProto->HasAttribute(SPELL_ATTR7_NO_PUSHBACK_ON_DAMAGE) || spellProto->HasAttribute(SPELL_ATTR3_TREAT_AS_PERIODIC))))
|
||||
if (victim != attacker && (!spellProto || !(spellProto->HasAttribute(SPELL_ATTR6_NO_PUSHBACK) || spellProto->HasAttribute(SPELL_ATTR7_NO_PUSHBACK_ON_DAMAGE) || spellProto->HasAttribute(SPELL_ATTR3_TREAT_AS_PERIODIC))))
|
||||
{
|
||||
if (Spell* spell = victim->m_currentSpells[CURRENT_GENERIC_SPELL])
|
||||
{
|
||||
@@ -993,12 +993,12 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit* excludeCasterChannel) cons
|
||||
else if (isCastDelayed())
|
||||
spell->Delayed();
|
||||
}
|
||||
|
||||
if (damage && victim->IsPlayer())
|
||||
if (Spell* spell = victim->m_currentSpells[CURRENT_CHANNELED_SPELL])
|
||||
if (spell->getState() == SPELL_STATE_CASTING && spell->m_spellInfo->HasChannelInterruptFlag(SpellAuraInterruptFlags::DamageChannelDuration))
|
||||
spell->DelayedChannel();
|
||||
}
|
||||
|
||||
if (damage && victim->IsPlayer())
|
||||
if (Spell* spell = victim->m_currentSpells[CURRENT_CHANNELED_SPELL])
|
||||
if (spell->getState() == SPELL_STATE_CASTING && spell->m_spellInfo->HasChannelInterruptFlag(SpellAuraInterruptFlags::DamageChannelDuration))
|
||||
spell->DelayedChannel();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user