From 02979daf761a5122efa7b8fa3e70509ecd69789e Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 10 Feb 2022 21:11:07 +0100 Subject: Core/Auras: Proc flag updates * Rename to official names * Corrected logic selecting flags for each spell cast - determine them by attributes instead of DmgClass * Implemented new proc flags (PROC_FLAG_CAST_ENDED, PROC_FLAG_LOOTED) --- src/server/scripts/Spells/spell_item.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index a034330a837..355155d67ed 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1331,7 +1331,7 @@ class spell_item_mark_of_conquest : public AuraScript void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { - if (eventInfo.GetTypeMask() & (PROC_FLAG_DONE_RANGED_AUTO_ATTACK | PROC_FLAG_DONE_SPELL_RANGED_DMG_CLASS)) + if (eventInfo.GetTypeMask() & (PROC_FLAG_DEAL_RANGED_ATTACK | PROC_FLAG_DEAL_RANGED_ABILITY)) { // in that case, do not cast heal spell PreventDefaultAction(); @@ -3485,10 +3485,10 @@ class spell_item_shard_of_the_scale : public SpellScriptLoader Unit* caster = eventInfo.GetActor(); Unit* target = eventInfo.GetProcTarget(); - if (eventInfo.GetTypeMask() & PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_POS) + if (eventInfo.GetTypeMask() & PROC_FLAG_DEAL_HELPFUL_SPELL) caster->CastSpell(target, HealProc, aurEff); - if (eventInfo.GetTypeMask() & PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_NEG) + if (eventInfo.GetTypeMask() & PROC_FLAG_DEAL_HARMFUL_SPELL) caster->CastSpell(target, DamageProc, aurEff); } -- cgit v1.2.3