diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-04-29 20:28:39 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2025-05-11 11:42:08 +0200 |
| commit | 4639c38c9e3655229473cef8919389495e6c2afb (patch) | |
| tree | d183e2f2457f9e64b6cc7d910ca2976aac6e2425 /src | |
| parent | 57502fdc6e178492620ffa0d833c4ee3c9bd3ee3 (diff) | |
Core/Auras: Support PROC_ATTR_REQ_SPELLMOD for procs using PROC_ATTR_USE_STACKS_FOR_CHARGES
(cherry picked from commit 5759ac1c9416675fc745484d7e915f64765a5b38)
Diffstat (limited to 'src')
| -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)) |