Combustion will now properly go on cooldown when the buff is manually cancelled. Fixes #19968.

1 files changed, 29 insertions, 0 deletions

diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index c40e164a130..68e74831164 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -60,6 +60,7 @@ enum MageSpells
     SPELL_MAGE_ARCANE_POTENCY_RANK_2             = 57531,
     SPELL_MAGE_HOT_STREAK_PROC                   = 48108,
     SPELL_MAGE_ARCANE_SURGE                      = 37436,
+    SPELL_MAGE_COMBUSTION                        = 11129,
     SPELL_MAGE_COMBUSTION_PROC                   = 28682,
     SPELL_MAGE_EMPOWERED_FIRE_PROC               = 67545,
     SPELL_MAGE_T10_2P_BONUS                      = 70752,
@@ -375,6 +376,33 @@ class spell_mage_combustion : public SpellScriptLoader
         }
 };
 
+// 28682 - Combustion proc
+class spell_mage_combustion_proc : public SpellScriptLoader
+{
+    public:
+        spell_mage_combustion_proc() : SpellScriptLoader("spell_mage_combustion_proc") { }
+
+        class spell_mage_combustion_proc_AuraScript : public AuraScript
+        {
+            PrepareAuraScript(spell_mage_combustion_proc_AuraScript);
+
+            void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+            {
+                GetTarget()->RemoveAurasDueToSpell(SPELL_MAGE_COMBUSTION);
+            }
+
+            void Register() override
+            {
+                AfterEffectRemove += AuraEffectRemoveFn(spell_mage_combustion_proc_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
+            }
+        };
+
+        AuraScript* GetAuraScript() const override
+        {
+            return new spell_mage_combustion_proc_AuraScript();
+        }
+};
+
 // -11185 - Improved Blizzard
 class spell_mage_imp_blizzard : public SpellScriptLoader
 {
@@ -1261,6 +1289,7 @@ void AddSC_mage_spell_scripts()
     new spell_mage_burnout();
     new spell_mage_cold_snap();
     new spell_mage_combustion();
+    new spell_mage_combustion_proc();
     new spell_mage_imp_blizzard();
     new spell_mage_imp_mana_gems();
     new spell_mage_empowered_fire();