diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-12-24 22:20:17 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-12-24 22:20:17 +0000 |
| commit | 81fee56bfe5b1fd596ef2e3183c55c84adb023fe (patch) | |
| tree | 2ac0cde9f2d4d7e77a377a190ba6a2a4693b7c16 /src/server/game/Handlers/QuestHandler.cpp | |
| parent | d3d9dfd7346b46eb0994ab89ac97a09d5dbde2fb (diff) | |
| parent | a05bc2fcfddee05c061505c55c4733339c47f6bf (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Quests/QuestDef.h
Diffstat (limited to 'src/server/game/Handlers/QuestHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/QuestHandler.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index cb10b607c4a..94c7b345ea1 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -474,16 +474,8 @@ void WorldSession::HandleQuestConfirmAccept(WorldPacket& recvData) if (!pOriginalPlayer) return; - if (quest->IsRaidQuest()) - { - if (!_player->IsInSameRaidWith(pOriginalPlayer)) - return; - } - else - { - if (!_player->IsInSameGroupWith(pOriginalPlayer)) - return; - } + if (!_player->IsInSameRaidWith(pOriginalPlayer)) + return; if (_player->CanAddQuest(quest, true)) _player->AddQuest(quest, NULL); // NULL, this prevent DB script from duplicate running |