diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-07-15 20:00:42 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-07-15 20:09:05 +0200 |
| commit | 8f9f1cc77ee9ea78268cd031a42f02f4ee047af8 (patch) | |
| tree | f9e1bc5ba00ea1a37d953109b4ba03b74e7d185b | |
| parent | 7b5373adb3dcb6a58e95ef3a70ceb6af7095a16b (diff) | |
Core/Quests: Failing/abandoning a quest should not unconditionally remove required items, non-quest specific items such as crafting reagents should remain in inventory
(cherry picked from commit 8460285f9442c41615f4bac80e9810a6eab8c252)
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 62054fdfaaf..f308d22e359 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -14509,11 +14509,15 @@ void Player::FailQuest(uint32 questId) // Destroy quest items on quest failure. for (QuestObjective const& obj : quest->GetObjectives()) if (obj.Type == QUEST_OBJECTIVE_ITEM) - DestroyItemCount(obj.ObjectID, obj.Amount, true, true); + if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(obj.ObjectID)) + if (itemTemplate->GetBonding() == BIND_QUEST_ITEM || itemTemplate->GetBonding() == BIND_QUEST_ITEM1) + DestroyItemCount(obj.ObjectID, obj.Amount, true, true); + // Destroy items received during the quest. for (uint8 i = 0; i < QUEST_ITEM_DROP_COUNT; ++i) - if (quest->ItemDrop[i] && quest->ItemDropQuantity[i]) - DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true, true); + if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->ItemDrop[i])) + if (quest->ItemDropQuantity[i] && (itemTemplate->GetBonding() == BIND_QUEST_ITEM || itemTemplate->GetBonding() == BIND_QUEST_ITEM1)) + DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true, true); } } @@ -14524,12 +14528,15 @@ void Player::AbandonQuest(uint32 questId) // Destroy quest items on quest abandon. for (QuestObjective const& obj : quest->GetObjectives()) if (obj.Type == QUEST_OBJECTIVE_ITEM) - DestroyItemCount(obj.ObjectID, obj.Amount, true, true); + if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(obj.ObjectID)) + if (itemTemplate->GetBonding() == BIND_QUEST_ITEM || itemTemplate->GetBonding() == BIND_QUEST_ITEM1) + DestroyItemCount(obj.ObjectID, obj.Amount, true, true); // Destroy items received during the quest. for (uint8 i = 0; i < QUEST_ITEM_DROP_COUNT; ++i) - if (quest->ItemDrop[i] && quest->ItemDropQuantity[i] && sObjectMgr->GetItemTemplate(quest->ItemDrop[i])->GetBonding() == BIND_QUEST_ITEM) - DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true, true); + if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->ItemDrop[i])) + if (quest->ItemDropQuantity[i] && (itemTemplate->GetBonding() == BIND_QUEST_ITEM || itemTemplate->GetBonding() == BIND_QUEST_ITEM1)) + DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true, true); } } |