diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-10-16 22:33:10 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-10-03 17:46:17 +0200 |
| commit | 6df51159c414128e5df9c8484cde3837f8e2d5f3 (patch) | |
| tree | 8d7bf6dea6cd2dd6470e678a168a6e0ae8bcfc06 | |
| parent | 0794904f523c16b2cae2e9044233340ea0d1804d (diff) | |
Core/Quest: send correct packet when a quest cannot be rewarded for item-related errors.
(cherry picked from commit c067fe544dd57c3ac72f3251b35d6f30e32d835a)
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index dcde42c61ad..39afab8ded1 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -14828,7 +14828,9 @@ bool Player::CanRewardQuest(Quest const* quest, uint32 reward, bool msg) InventoryResult res = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, quest->RewardChoiceItemId[i], quest->RewardChoiceItemCount[i]); if (res != EQUIP_ERR_OK) { - SendEquipError(res, nullptr, nullptr, quest->RewardChoiceItemId[i]); + if (msg) + SendQuestFailed(quest->GetQuestId(), res); + return false; } } @@ -14844,7 +14846,9 @@ bool Player::CanRewardQuest(Quest const* quest, uint32 reward, bool msg) InventoryResult res = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, quest->RewardItemId[i], quest->RewardItemCount[i]); if (res != EQUIP_ERR_OK) { - SendEquipError(res, nullptr, nullptr, quest->RewardItemId[i]); + if (msg) + SendQuestFailed(quest->GetQuestId(), res); + return false; } } |