From 957ccdb8453f9136cd2ae7c5ede453b5a126964a Mon Sep 17 00:00:00 2001
From: Walter Pagani <paganiwalter@gmail.com>
Date: Mon, 21 Aug 2023 16:15:00 -0300
Subject: [PATCH] fix(Script/Spells): Book of Fel Names (#17051)

---
 .../sql/updates/pending_db_world/rev_1692638445679940800.sql | 4 ++++
 src/server/scripts/Spells/spell_quest.cpp                    | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1692638445679940800.sql

diff --git a/data/sql/updates/pending_db_world/rev_1692638445679940800.sql b/data/sql/updates/pending_db_world/rev_1692638445679940800.sql
new file mode 100644
index 000000000..99b923ce0
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1692638445679940800.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (37906, 36298);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(37906, 'spell_q10651_q10692_book_of_fel_names');
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index 10a1a417c..4c87c887a 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -2451,7 +2451,7 @@ class spell_q4735_collect_rookery_egg : public SpellScript
     }
 };
 
-enum book
+enum BookOfFelNames
 {
     SPELL_METAMORPHOSIS   = 36298
 };
@@ -2462,7 +2462,8 @@ class spell_q10651_q10692_book_of_fel_names : public SpellScript
 
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
-        GetHitUnit()->RemoveAurasDueToSpell(SPELL_METAMORPHOSIS);
+        if (GetHitUnit()->HasAura(SPELL_METAMORPHOSIS))
+            GetHitUnit()->RemoveAurasDueToSpell(SPELL_METAMORPHOSIS);
     }
 
     void Register() override