*Update to Mangos 7125.

--HG-- branch : trunk
2009-01-20 19:59:43 -06:00
parent 1bbd896861
commit 68c0bcd069
51 changed files with 1058 additions and 725 deletions
@@ -910,13 +910,11 @@ void Creature::sendPreparedGossip(Player* player)
    if(!player)
        return;

-    GossipMenu& gossipmenu = player->PlayerTalkClass->GetGossipMenu();
-
    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 (gossipmenu.Empty() && GetNpcTextId() == 0)
+    if (player->PlayerTalkClass->GetGossipMenu().Empty() && !player->PlayerTalkClass->GetQuestMenu().Empty())
    {
        player->SendPreparedQuest(GetGUID());
        return;