DB/Quest: Update 'Into the Realm of Shadows'

Closes #27895

2 files changed, 10 insertions, 15 deletions

diff --git a/sql/updates/world/3.3.5/2022_03_31_00_world.sql b/sql/updates/world/3.3.5/2022_03_31_00_world.sql
new file mode 100644
index 00000000000..99bbe24914e
--- /dev/null
+++ b/sql/updates/world/3.3.5/2022_03_31_00_world.sql
@@ -0,0 +1,9 @@
+--
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 28653;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 28653 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(28653,0,0,0,19,0,100,0,12687,0,0,0,0,11,52359,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Salanar the Horseman - On Quest 'Into the Realm of Shadows' Taken - Cast 'Realm of Shadows'"),
+(28653,0,1,2,62,0,100,0,9739,0,0,0,0,11,52359,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Salanar the Horseman - On Gossip Option 0 Selected - Cast 'Realm of Shadows'"),
+(28653,0,2,0,61,0,100,0,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Salanar the Horseman - On Gossip Option 0 Selected - Close Gossip");
+
+DELETE FROM `spell_area` WHERE `spell` = 52693;
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 587f4a67d43..958a5be3436 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -771,11 +771,8 @@ private:
 
 enum SalanarTheHorseman
 {
-    GOSSIP_SALANAR_MENU               = 9739,
-    GOSSIP_SALANAR_OPTION             = 0,
     SALANAR_SAY                       = 0,
     QUEST_INTO_REALM_OF_SHADOWS       = 12687,
-    NPC_SALANAR_IN_REALM_OF_SHADOWS   = 28788,
     SPELL_EFFECT_STOLEN_HORSE         = 52263,
     SPELL_DELIVER_STOLEN_HORSE        = 52264,
     SPELL_CALL_DARK_RIDER             = 52266,
@@ -792,16 +789,6 @@ public:
     {
         npc_salanar_the_horsemanAI(Creature* creature) : ScriptedAI(creature) { }
 
-        bool OnGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
-        {
-            if (menuId == GOSSIP_SALANAR_MENU && gossipListId == GOSSIP_SALANAR_OPTION)
-            {
-                player->CastSpell(player, SPELL_REALM_OF_SHADOWS, true);
-                player->PlayerTalkClass->SendCloseGossip();
-            }
-            return false;
-        }
-
         void MoveInLineOfSight(Unit* who) override
         {
             ScriptedAI::MoveInLineOfSight(who);
@@ -812,8 +799,7 @@ public:
                 {
                     if (Player* player = charmer->ToPlayer())
                     {
-                        // for quest Into the Realm of Shadows(QUEST_INTO_REALM_OF_SHADOWS)
-                        if (me->GetEntry() == NPC_SALANAR_IN_REALM_OF_SHADOWS && player->GetQuestStatus(QUEST_INTO_REALM_OF_SHADOWS) == QUEST_STATUS_INCOMPLETE)
+                        if (player->GetQuestStatus(QUEST_INTO_REALM_OF_SHADOWS) == QUEST_STATUS_INCOMPLETE)
                         {
                             player->GroupEventHappens(QUEST_INTO_REALM_OF_SHADOWS, me);
                             Talk(SALANAR_SAY);