[7278] In case gossip flag use gossip menu instead quest menu as client expected. Author: NoFantasy <NoFantasy@getmangos.com>

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index b6444b7c493..d9cd7b6a0c8 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -930,8 +930,8 @@ void Creature::sendPreparedGossip(Player* player)
     if(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_WORLDEVENT) // if world event npc then
         gameeventmgr.HandleWorldEventGossip(player, this);      // update world state with progress
 
-    // in case empty gossip menu open quest menu if any
-    if (player->PlayerTalkClass->GetGossipMenu().Empty() && !player->PlayerTalkClass->GetQuestMenu().Empty())
+    // in case no gossip flag and quest menu not empty, open quest menu (client expect gossip menu with this flag)
+    if (!HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_GOSSIP) && !player->PlayerTalkClass->GetQuestMenu().Empty())
     {
         player->SendPreparedQuest(GetGUID());
         return;