aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorw1sht0l1v3 <w1sht0l1v3@gmail.com>2015-10-25 18:21:08 +0200
committerCarbenium <carbenium@outlook.com>2015-11-07 00:47:58 +0100
commitf605300c71ebf2586bdf1282e3adb8669f3e2720 (patch)
tree06f67f7c9024e9fa5aa14a6c9d5b21d05108a09b /src
parentb236f5f50d2c87291546d0de9775954b6ba47c64 (diff)
Core/Quests: Fix a CMSG injection abuse.
closes #15709 (cherry picked from commit 11f0c85bd48e7d487609c1a5a82d7e544ca8d84e) Conflicts: src/server/game/Handlers/QuestHandler.cpp
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Handlers/QuestHandler.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index 76303c063e5..33c15e271c7 100644
--- a/src/server/game/Handlers/QuestHandler.cpp
+++ b/src/server/game/Handlers/QuestHandler.cpp
@@ -115,8 +115,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPackets::Quest::QuestG
if (Player* playerQuestObject = object->ToPlayer())
{
- if ((!_player->GetDivider().IsEmpty() && _player->GetDivider() != packet.QuestGiverGUID) ||
- ((object != _player && !playerQuestObject->CanShareQuest(packet.QuestID))))
+ if ((_player->GetDivider().IsEmpty() && _player->GetDivider() != packet.QuestGiverGUID) || !playerQuestObject->CanShareQuest(packet.QuestID))
{
CLOSE_GOSSIP_CLEAR_DIVIDER();
return;