Spell/Unit: Disable charge proccing in proc system for spellmods

Closes cmangos/issues#3648
cmangos · Jan 29, 2024 · 0947117 · 0947117
1 parent 41f79bb
commit 0947117
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/game/Entities/Unit.h b/src/game/Entities/Unit.h
@@ -2234,6 +2234,7 @@ class Unit : public WorldObject
         SpellAuraProcResult HandleRemoveByDamageChanceProc(ProcExecutionData& data);
         SpellAuraProcResult HandleInvisibilityAuraProc(ProcExecutionData& data);
         SpellAuraProcResult HandlePeriodicAuraProc(ProcExecutionData& data);
+        SpellAuraProcResult HandleSpellModProc(ProcExecutionData& data);
         SpellAuraProcResult HandleNULLProc(ProcExecutionData& /*data*/)
         {
             // no proc handler for this aura type

diff --git a/src/game/Spells/UnitAuraProcHandler.cpp b/src/game/Spells/UnitAuraProcHandler.cpp
@@ -138,8 +138,8 @@ pAuraProcHandler AuraProcHandler[TOTAL_AURAS] =
     &Unit::HandleNULLProc,                                  //104 SPELL_AURA_WATER_WALK
     &Unit::HandleNULLProc,                                  //105 SPELL_AURA_FEATHER_FALL
     &Unit::HandleNULLProc,                                  //106 SPELL_AURA_HOVER
-    &Unit::HandleNULLProc,                                  //107 SPELL_AURA_ADD_FLAT_MODIFIER
-    &Unit::HandleNULLProc,                                  //108 SPELL_AURA_ADD_PCT_MODIFIER
+    &Unit::HandleSpellModProc,                              //107 SPELL_AURA_ADD_FLAT_MODIFIER
+    &Unit::HandleSpellModProc,                              //108 SPELL_AURA_ADD_PCT_MODIFIER
     &Unit::HandleNULLProc,                                  //109 SPELL_AURA_ADD_TARGET_TRIGGER
     &Unit::HandleNULLProc,                                  //110 SPELL_AURA_MOD_POWER_REGEN_PERCENT
     &Unit::HandleMagnetAuraProc,                            //111 SPELL_AURA_ADD_CASTER_HIT_TRIGGER
@@ -2928,3 +2928,9 @@ SpellAuraProcResult Unit::HandlePeriodicAuraProc(ProcExecutionData& data)
 
     return SPELL_AURA_PROC_OK;
 }
+
+SpellAuraProcResult Unit::HandleSpellModProc(ProcExecutionData& data)
+{
+    // one day if figured out - remove charges through proc system but currently not reliable enough for edge cases
+    return SPELL_AURA_PROC_CANT_TRIGGER;
+}