diff options
| author | Subv <subv2112@gmail.com> | 2014-09-12 11:32:50 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2014-09-12 11:32:50 -0500 |
| commit | b7865a3eb52efc8c77bfc8ffee2c97f57657cebc (patch) | |
| tree | 0f89a1089dcb3b7a358efffd55ef0c515ba7ca72 | |
| parent | d7b0ee7c0366bf78e09f4eca5f93e65361c5a2b6 (diff) | |
Core/Quests: Only prompt the player to take the next quest in a chain if he meets the conditions for that quest.
| -rw-r--r-- | src/server/game/Handlers/QuestHandler.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index f7c3c8a2be6..3590796bc0a 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -298,10 +298,14 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket& recvData) // Send next quest if (Quest const* nextQuest = _player->GetNextQuest(guid, quest)) { - if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true) && _player->CanTakeQuest(nextQuest, true)) - _player->AddQuestAndCheckCompletion(nextQuest, object); - - _player->PlayerTalkClass->SendQuestGiverQuestDetails(nextQuest, guid, true); + // Only send the quest to the player if the conditions are met + if (_player->CanTakeQuest(nextQuest, true)) + { + if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true)) + _player->AddQuestAndCheckCompletion(nextQuest, object); + + _player->PlayerTalkClass->SendQuestGiverQuestDetails(nextQuest, guid, true); + } } questgiver->AI()->sQuestReward(_player, quest, reward); @@ -316,10 +320,14 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket& recvData) // Send next quest if (Quest const* nextQuest = _player->GetNextQuest(guid, quest)) { - if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true) && _player->CanTakeQuest(nextQuest, true)) - _player->AddQuestAndCheckCompletion(nextQuest, object); - - _player->PlayerTalkClass->SendQuestGiverQuestDetails(nextQuest, guid, true); + // Only send the quest to the player if the conditions are met + if (_player->CanTakeQuest(nextQuest, true)) + { + if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true)) + _player->AddQuestAndCheckCompletion(nextQuest, object); + + _player->PlayerTalkClass->SendQuestGiverQuestDetails(nextQuest, guid, true); + } } questGiver->AI()->QuestReward(_player, quest, reward); |