diff options
| author | Subv <subv2112@gmail.com> | 2014-09-13 16:50:09 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2014-09-13 16:50:09 -0500 |
| commit | 60eafebbcb425ee2bb25dd5b14fcaa349c86210f (patch) | |
| tree | 3b2b782fe8bfdd583160df73115f880e2277ec85 | |
| parent | 3b0617ec459ea25068825da6d25b0ab91ca03c3f (diff) | |
| parent | 1e5f269d7d119a71291d845f98fb106383ae6247 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/QuestHandler.cpp
| -rw-r--r-- | src/server/game/Handlers/QuestHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 7f87aa90257..b6aa31af3f3 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -309,7 +309,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket& recvData) if (Quest const* nextQuest = _player->GetNextQuest(guid, quest)) { // Only send the quest to the player if the conditions are met - if (_player->CanTakeQuest(nextQuest, true)) + if (_player->CanTakeQuest(nextQuest, false)) { if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true)) _player->AddQuestAndCheckCompletion(nextQuest, object); @@ -332,7 +332,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket& recvData) if (Quest const* nextQuest = _player->GetNextQuest(guid, quest)) { // Only send the quest to the player if the conditions are met - if (_player->CanTakeQuest(nextQuest, true)) + if (_player->CanTakeQuest(nextQuest, false)) { if (nextQuest->IsAutoAccept() && _player->CanAddQuest(nextQuest, true)) _player->AddQuestAndCheckCompletion(nextQuest, object); |