diff options
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 5725fce7ed6..ce981ac68ec 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1861,16 +1861,13 @@ uint32 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)) |