From ffd578559a99fa46f32dc1fc8e3af699b97f6079 Mon Sep 17 00:00:00 2001 From: Poszer <41213210+poszer@users.noreply.github.com> Date: Thu, 10 Jan 2019 13:23:46 +0100 Subject: [PATCH 1/3] Update Player.cpp --- src/server/game/Entities/Player/Player.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1c468edf5..ff19246ec 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15750,7 +15750,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->RequiredItemId[i])) { if (quest->RequiredItemCount[i] > 0 && itemTemplate->Bonding == BIND_QUEST_ITEM && !quest->IsRepeatable() && !HasQuestForItem(quest->RequiredItemId[i], quest_id, true)) - DestroyItemCount(quest->RequiredItemId[i], 9999, true); + DestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true); else DestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true); } @@ -15996,7 +15996,7 @@ void Player::FailQuest(uint32 questId) for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i) if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->RequiredItemId[i])) if (quest->RequiredItemCount[i] > 0 && itemTemplate->Bonding == BIND_QUEST_ITEM) - DestroyItemCount(quest->RequiredItemId[i], 9999, true); + DestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true); for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->ItemDrop[i])) @@ -16013,7 +16013,7 @@ void Player::AbandonQuest(uint32 questId) for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i) if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->RequiredItemId[i])) if (quest->RequiredItemCount[i] > 0 && itemTemplate->Bonding == BIND_QUEST_ITEM) - DestroyItemCount(quest->RequiredItemId[i], 9999, true); + DDestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true); for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->ItemDrop[i])) From e993c20cacf5df6a4cfcc6381053bd011cb3b165 Mon Sep 17 00:00:00 2001 From: Poszer <41213210+poszer@users.noreply.github.com> Date: Thu, 10 Jan 2019 13:35:54 +0100 Subject: [PATCH 2/3] Update Player.cpp --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ff19246ec..f0a580d11 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16013,7 +16013,7 @@ void Player::AbandonQuest(uint32 questId) for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i) if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->RequiredItemId[i])) if (quest->RequiredItemCount[i] > 0 && itemTemplate->Bonding == BIND_QUEST_ITEM) - DDestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true); + DestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true); for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->ItemDrop[i])) From 6ef7c403139cde2cd2f97cb3b93d75e543bb017c Mon Sep 17 00:00:00 2001 From: Poszer <41213210+poszer@users.noreply.github.com> Date: Tue, 15 Jan 2019 00:48:54 +0100 Subject: [PATCH 3/3] Update Player.cpp --- src/server/game/Entities/Player/Player.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index f0a580d11..26a0a3469 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15760,7 +15760,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->ItemDrop[i])) { if (quest->ItemDropQuantity[i] > 0 && itemTemplate->Bonding == BIND_QUEST_ITEM && !quest->IsRepeatable() && !HasQuestForItem(quest->ItemDrop[i], quest_id)) - DestroyItemCount(quest->ItemDrop[i], 9999, true); + DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true); else DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true); } @@ -16001,7 +16001,7 @@ void Player::FailQuest(uint32 questId) for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->ItemDrop[i])) if (quest->ItemDropQuantity[i] > 0 && itemTemplate->Bonding == BIND_QUEST_ITEM) - DestroyItemCount(quest->ItemDrop[i], 9999, true); + DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true); } } @@ -16018,7 +16018,7 @@ void Player::AbandonQuest(uint32 questId) for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i) if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->ItemDrop[i])) if (quest->ItemDropQuantity[i] > 0 && itemTemplate->Bonding == BIND_QUEST_ITEM) - DestroyItemCount(quest->ItemDrop[i], 9999, true); + DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true); } }