Core/Spells: Fix Banish removal behavior

Closes #143 & #1173

1 files changed, 52 insertions, 0 deletions

diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index 7a6ad66280a..0a361e642ab 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -230,10 +230,62 @@ class spell_warl_seed_of_corruption : public SpellScriptLoader
         }
 };
 
+class spell_warl_banish : public SpellScriptLoader
+{
+    public:
+        spell_warl_banish() : SpellScriptLoader("spell_warl_banish") { }
+
+        class spell_warl_banish_SpellScript : public SpellScript
+        {
+            PrepareSpellScript(spell_warl_banish_SpellScript);
+
+            bool Load()
+            {
+                _removed = false;
+                return true;
+            }
+
+            void HandleBanish()
+            {
+                if (Unit* target = GetHitUnit())
+                {
+                    if (target->GetAuraEffect(SPELL_AURA_SCHOOL_IMMUNITY, SPELLFAMILY_WARLOCK, 0, 0x08000000, 0))
+                    {
+                        //No need to remove old aura since its removed due to not stack by current Banish aura
+                        PreventHitDefaultEffect(EFFECT_0);
+                        PreventHitDefaultEffect(EFFECT_1);
+                        PreventHitDefaultEffect(EFFECT_2);
+                        _removed = true;
+                    }
+                }
+            }
+
+            void RemoveAura()
+            {
+                if (_removed)
+                    PreventHitAura();
+            }
+
+            void Register()
+            {
+                BeforeHit += SpellHitFn(spell_warl_banish_SpellScript::HandleBanish);
+                AfterHit += SpellHitFn(spell_warl_banish_SpellScript::RemoveAura);
+            }
+
+            bool _removed;
+        };
+
+        SpellScript* GetSpellScript() const
+        {
+            return new spell_warl_banish_SpellScript();
+        }
+};
+
 void AddSC_warlock_spell_scripts()
 {
     new spell_warl_demonic_empowerment();
     new spell_warl_create_healthstone();
     new spell_warl_everlasting_affliction();
     new spell_warl_seed_of_corruption();
+    new spell_warl_banish();
 }