Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 08:59:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: merged master version of checking for cast immunities

Browse Source
This commit is contained in:
Ovahlord
2022-03-10 20:41:47 +01:00
parent ae606af1ab
commit fd22ea32e6
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/game/Spells/SpellInfo.cpp
View File

@@ -1145,12 +1145,12 @@ bool SpellInfo::HasOnlyDamageEffects() const
return true;
}
bool SpellInfo::CanBeInterrupted(Unit* interruptTarget) const
bool SpellInfo::CanBeInterrupted(Unit* interruptTarget, bool ignoreImmunity /*= false*/) const
{
return HasAttribute(SPELL_ATTR7_CAN_ALWAYS_BE_INTERRUPTED)
|| HasChannelInterruptFlag(SpellAuraInterruptFlags::Damage | SpellAuraInterruptFlags::EnteringCombat)
|| (interruptTarget->IsPlayer() && InterruptFlags.HasFlag(SpellInterruptFlags::DamageCancelsPlayerOnly))
|| (!(interruptTarget->GetMechanicImmunityMask() & (1 << MECHANIC_INTERRUPT))
|| ((!(interruptTarget->GetMechanicImmunityMask() & (1 << MECHANIC_INTERRUPT)) || ignoreImmunity)
&& PreventionType & SPELL_PREVENTION_TYPE_SILENCE);
}
@@ -3315,17 +3315,10 @@ uint32 SpellInfo::GetAllowedMechanicMask() const
uint32 SpellInfo::GetMechanicImmunityMask(Unit* caster) const
{
bool canBeInterrupted = [&]()
{
return HasAttribute(SPELL_ATTR7_CAN_ALWAYS_BE_INTERRUPTED)
|| HasChannelInterruptFlag(SpellAuraInterruptFlags::Damage | SpellAuraInterruptFlags::EnteringCombat)
|| (caster->IsPlayer() && InterruptFlags.HasFlag(SpellInterruptFlags::DamageCancelsPlayerOnly))
|| PreventionType & SPELL_PREVENTION_TYPE_SILENCE;
}();
uint32 casterMechanicImmunityMask = caster->GetMechanicImmunityMask();
uint32 mechanicImmunityMask = 0;
if (canBeInterrupted)
if (CanBeInterrupted(caster, true))
{
if (casterMechanicImmunityMask & (1 << MECHANIC_INTERRUPT))
mechanicImmunityMask |= (1 << MECHANIC_INTERRUPT);

2
src/server/game/Spells/SpellInfo.h
View File

@@ -489,7 +489,7 @@ class TC_GAME_API SpellInfo
inline bool HasAttribute(SpellAttr10 attribute) const { return !!(AttributesEx10 & attribute); }
inline bool HasAttribute(SpellCustomAttributes customAttribute) const { return !!(AttributesCu & customAttribute); }
bool CanBeInterrupted(Unit* interruptTarget) const;
bool CanBeInterrupted(Unit* interruptTarget, bool ignoreImmunity = false) const;
bool HasAnyAuraInterruptFlag() const;
bool HasAuraInterruptFlag(SpellAuraInterruptFlags flag) const { return AuraInterruptFlags.HasFlag(flag); }