Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-13 21:49:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Quest: improve source item deletion logic for items that give quests (#23250)

Browse Source 
* Core/Quest: improve source item deletion logic for items that give quests.

Prevent deletion of items that aren't supposed to be destroyed (like Demon Scarred Cloak).

* Whoops.
This commit is contained in:
Wyrserth
2019-05-10 17:49:46 +02:00
committed by Ovahlord
parent 75edb60b79
commit e037332035
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/server/game/Entities/Player/Player.cpp
View File

@@ -15085,8 +15085,11 @@ void Player::AddQuestAndCheckCompletion(Quest const* quest, Object* questGiver)
Item* item = static_cast<Item*>(questGiver);
sScriptMgr->OnQuestAccept(this, item, quest);
// destroy not required for quest finish quest starting item
// There are two cases where the source item is not destroyed when the quest is accepted:
// - It is required to finish the quest, and is an unique item
// - It is the same item present in the source item field (item that would be given on quest accept)
bool destroyItem = true;
for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
{
if (quest->RequiredItemId[i] == item->GetEntry() && item->GetTemplate()->MaxCount > 0)
@@ -15096,6 +15099,9 @@ void Player::AddQuestAndCheckCompletion(Quest const* quest, Object* questGiver)
}
}
if (quest->GetSrcItemId() == item->GetEntry())
destroyItem = false;
if (destroyItem)
DestroyItem(item->GetBagSlot(), item->GetSlot(), true);
@@ -16056,6 +16062,11 @@ bool Player::GiveQuestSourceItem(Quest const* quest)
uint32 srcitem = quest->GetSrcItemId();
if (srcitem > 0)
{
// Don't give source item if it is the same item used to start the quest
ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(srcitem);
if (quest->GetQuestId() == itemTemplate->StartQuest)
return true;
uint32 count = quest->GetSrcItemCount();
if (count <= 0)
count = 1;
@@ -16093,10 +16104,9 @@ bool Player::TakeQuestSourceItem(uint32 questId, bool msg)
if (count <= 0)
count = 1;
// exist two cases when destroy source quest item not possible:
// a) non un-equippable item (equipped non-empty bag, for example)
// b) when quest is started from an item and item also is needed in
// the end as RequiredItemId
// There are two cases where the source item is not destroyed:
// - Item cannot be unequipped (example: non-empty bags)
// - The source item is the item that started the quest, so the player is supposed to keep it (otherwise it was already destroyed in AddQuestAndCheckCompletion())
InventoryResult res = CanUnequipItems(srcItemId, count);
if (res != EQUIP_ERR_OK)
{
@@ -16106,12 +16116,7 @@ bool Player::TakeQuestSourceItem(uint32 questId, bool msg)
}
ASSERT(item);
bool destroyItem = true;
for (uint8 n = 0; n < QUEST_ITEM_OBJECTIVES_COUNT; ++n)
if (item->StartQuest == questId && srcItemId == quest->RequiredItemId[n])
destroyItem = false;
if (destroyItem)
if (item->StartQuest != questId)
DestroyItemCount(srcItemId, count, true, true);
}
}