diff options
Diffstat (limited to 'src/server/game/Handlers/QuestHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/QuestHandler.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 85254d068b7..24f2a442998 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -91,13 +91,12 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket& recvData) // Stop the npc if moving creature->StopMoving(); - if (sScriptMgr->OnGossipHello(_player, creature)) + _player->PlayerTalkClass->ClearMenus(); + if (creature->AI()->GossipHello(_player)) return; _player->PrepareGossipMenu(creature, creature->GetCreatureTemplate()->GossipMenuId, true); _player->SendPreparedGossip(creature); - - creature->AI()->sGossipHello(_player); } void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket& recvData) @@ -316,8 +315,8 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket& recvData) } } - if (!sScriptMgr->OnQuestReward(_player, questgiver, quest, reward)) - questgiver->AI()->sQuestReward(_player, quest, reward); + _player->PlayerTalkClass->ClearMenus(); + questgiver->AI()->QuestReward(_player, quest, reward); break; } case TYPEID_GAMEOBJECT: @@ -336,8 +335,8 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket& recvData) } } - if (!sScriptMgr->OnQuestReward(_player, questGiver, quest, reward)) - questGiver->AI()->QuestReward(_player, quest, reward); + _player->PlayerTalkClass->ClearMenus(); + questGiver->AI()->QuestReward(_player, quest, reward); break; } default: |