nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-03-09 18:50:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): Exempt kill/death events from triggered-spell proc filter (#24859)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-02-24 19:15:16 -06:00
committed by GitHub
parent 1e73383b54
commit 25ff0c9ef4
3 changed files with 117 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2164,9 +2164,12 @@ uint8 Aura::GetProcEffectMask(AuraApplication* aurApp, ProcEventInfo& eventInfo,
return 0;
// check if aura can proc when spell is triggered (exception for hunter auto shot & wands)
// Kill/killed/death events should not be blocked by the triggered-spell check -
// the kill itself is the proc trigger, not the spell that dealt the killing blow
if (!GetSpellInfo()->HasAttribute(SPELL_ATTR3_CAN_PROC_FROM_PROCS) &&
!(procEntry->AttributesMask & PROC_ATTR_TRIGGERED_CAN_PROC) &&
!(eventInfo.GetTypeMask() & AUTO_ATTACK_PROC_FLAG_MASK))
!(eventInfo.GetTypeMask() & AUTO_ATTACK_PROC_FLAG_MASK) &&
!(eventInfo.GetTypeMask() & (PROC_FLAG_KILL | PROC_FLAG_KILLED | PROC_FLAG_DEATH)))
{
if (spell->IsTriggered() && !spell->GetSpellInfo()->HasAttribute(SPELL_ATTR3_NOT_A_PROC))
return 0;