Core/Auras: Support PROC_ATTR_REQ_SPELLMOD for procs using PROC_ATTR_USE_STACKS_FOR_CHARGES
This commit is contained in:
1 parent
aa3378824b
commit
bc3d82e4bb
1 file changed
+6
-9
@@ -1850,16 +1850,13 @@ uint8 Aura::GetProcEffectMask(AuraApplication* aurApp, ProcEventInfo& eventInfo,
|
||||
}
|
||||
|
||||
// check if we have charges to proc with
|
||||
if (IsUsingCharges())
|
||||
{
|
||||
if (!GetCharges())
|
||||
return 0;
|
||||
if (IsUsingCharges() && !GetCharges())
|
||||
return 0;
|
||||
|
||||
if (procEntry->AttributesMask & PROC_ATTR_REQ_SPELLMOD)
|
||||
if (Spell const* spell = eventInfo.GetProcSpell())
|
||||
if (!spell->m_appliedMods.count(const_cast<Aura*>(this)))
|
||||
return 0;
|
||||
}
|
||||
if (procEntry->AttributesMask & PROC_ATTR_REQ_SPELLMOD && (IsUsingCharges() || procEntry->AttributesMask & PROC_ATTR_USE_STACKS_FOR_CHARGES))
|
||||
if (Spell const* spell = eventInfo.GetProcSpell())
|
||||
if (!spell->m_appliedMods.contains(const_cast<Aura*>(this)))
|
||||
return 0;
|
||||
|
||||
// check proc cooldown
|
||||
if (IsProcOnCooldown(now))
|
||||
|
||||
Reference in new issue
Block a user