Scripts/Gossips: Set gossip menu id for scripts that load menu items from database

(cherry picked from commit 900a2f6d88f7676f5053da33d80981297b07ccde)

3 files changed, 11 insertions, 1 deletions

diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
index b34e27a9c7d..e3c4e1e6c61 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
@@ -467,11 +467,18 @@ public:
                 instance->GetBossState(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED &&
                 instance->GetBossState(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED &&
                 instance->GetBossState(BOSS_BLACK_KNIGHT) == NOT_STARTED)
+            {
+                InitGossipMenuFor(player, GOSSIP_START_EVENT1_MID);
                 AddGossipItemFor(player, GOSSIP_START_EVENT1_MID, GOSSIP_START_EVENT1_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                SendGossipMenuFor(player, player->GetGossipTextId(GOSSIP_START_EVENT1_MID, me), me->GetGUID());
+            }
             else
+            {
+                InitGossipMenuFor(player, GOSSIP_START_EVENT2_MID);
                 AddGossipItemFor(player, GOSSIP_START_EVENT2_MID, GOSSIP_START_EVENT2_OID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+                SendGossipMenuFor(player, player->GetGossipTextId(GOSSIP_START_EVENT2_MID, me), me->GetGUID());
+            }
 
-            SendGossipMenuFor(player, player->GetGossipTextId(me), me->GetGUID());
             return true;
         }
 
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
index 80f35573d52..700a707fb13 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
@@ -689,6 +689,7 @@ struct npc_brann_hos : public EscortAI
 
     bool OnGossipHello(Player* player) override
     {
+        InitGossipMenuFor(player, GOSSIP_ITEM_START_MID);
         if (me->IsQuestGiver())
             player->PrepareQuestMenu(me->GetGUID());
 
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 20e0f58a20c..1badfa71eec 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -522,6 +522,7 @@ public:
 
         bool OnGossipHello(Player* player) override
         {
+            InitGossipMenuFor(player, GOSSIP_THASSARIAN_MENU);
             if (me->IsQuestGiver())
                 player->PrepareQuestMenu(me->GetGUID());
 
@@ -1290,6 +1291,7 @@ struct npc_hidden_cultist : public ScriptedAI
                 return false;
         }
 
+        InitGossipMenuFor(player, charGossipItem);
         if (player->HasAura(SPELL_RIGHTEOUS_VISION) && player->GetQuestStatus(QUEST_THE_HUNT_IS_ON) == QUEST_STATUS_INCOMPLETE)
             AddGossipItemFor(player, charGossipItem, GOSSIP_ITEM_HIDDEN_CULTIST_OPTIONID, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);