From 203450e949a1e89077d6b7d71841a69eb3017e78 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Wed, 11 May 2022 03:54:11 +0200
Subject: [PATCH] fix(Scripts/BlackwingLair): Warrior Class Call should  not
 restore to default stance on removal. (#11671)

---
 .../rev_1651936089141074200.sql               |  2 ++
 .../BlackwingLair/boss_nefarian.cpp           | 24 -------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1651936089141074200.sql

diff --git a/data/sql/updates/pending_db_world/rev_1651936089141074200.sql b/data/sql/updates/pending_db_world/rev_1651936089141074200.sql
new file mode 100644
index 000000000..d3c25e37f
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1651936089141074200.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName`='aura_class_call_berserk';
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
index 2b1164d0d..bbe76efe5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
@@ -1157,29 +1157,6 @@ class spell_class_call_polymorph : public SpellScript
     }
 };
 
-class aura_class_call_berserk : public AuraScript
-{
-    PrepareAuraScript(aura_class_call_berserk);
-
-    bool Validate(SpellInfo const* /*spellInfo*/) override
-    {
-        return ValidateSpellInfo({ SPELL_WARRIOR_BERSERK });
-    }
-
-    void HandleOnEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-    {
-        if (Unit* target = GetTarget())
-        {
-            target->CastSpell(target, SPELL_WARRIOR_BERSERK);
-        }
-    }
-
-    void Register() override
-    {
-        OnEffectRemove += AuraEffectRemoveFn(aura_class_call_berserk::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
-    }
-};
-
 class spell_corrupted_totems : public SpellScript
 {
     PrepareSpellScript(spell_corrupted_totems);
@@ -1314,7 +1291,6 @@ void AddSC_boss_nefarian()
     RegisterSpellScript(aura_class_call_wild_magic);
     RegisterSpellScript(aura_class_call_siphon_blessing);
     RegisterSpellScript(spell_class_call_polymorph);
-    RegisterSpellScript(aura_class_call_berserk);
     RegisterSpellScript(spell_corrupted_totems);
     RegisterSpellScript(spell_shadowblink);
     RegisterSpellScript(spell_spawn_drakonid);