Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 03:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Auras: Fixed incorrect cherry-pick merge conflict resolution - fixes procs never triggering

Browse Source 
Closes #24172
This commit is contained in:
Shauren
2020-02-18 16:59:25 +01:00
parent a693d30f79
commit 1669b58374
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Spells/Auras/SpellAuras.cpp
View File

@@ -1729,7 +1729,7 @@ uint32 Aura::GetProcEffectMask(AuraApplication* aurApp, ProcEventInfo& eventInfo
return 0;
// At least one effect has to pass checks to proc aura
uint32 procEffectMask = 0;
uint32 procEffectMask = aurApp->GetEffectMask();
for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
if (procEffectMask & (1u << i))
if ((procEntry->DisableEffectsMask & (1u << i)) || !GetEffect(i)->CheckEffectProc(aurApp, eventInfo))