aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Entities/Player/Player.cpp121
-rw-r--r--src/server/game/Entities/Player/Player.h7
-rw-r--r--src/server/game/Handlers/LootHandler.cpp6
-rw-r--r--src/server/game/Handlers/VoidStorageHandler.cpp10
-rw-r--r--src/server/game/Loot/Loot.cpp10
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp9
-rw-r--r--src/server/game/Spells/SpellEffects.cpp29
7 files changed, 56 insertions, 136 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index f78fd9fec23..16dd4914225 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -8085,20 +8085,6 @@ void Player::ApplyItemLootedSpell(Item* item, bool apply)
}
}
-void Player::ApplyItemLootedSpell(ItemTemplate const* itemTemplate)
-{
- if (itemTemplate->HasFlag(ITEM_FLAG_LEGACY))
- return;
-
- for (ItemEffectEntry const* effect : itemTemplate->Effects)
- {
- if (effect->TriggerType != ITEM_SPELLTRIGGER_ON_LOOTED)
- continue;
-
- CastSpell(this, effect->SpellID, true);
- }
-}
-
void Player::_RemoveAllItemMods()
{
TC_LOG_DEBUG("entities.player.items", "_RemoveAllItemMods start.");
@@ -10684,13 +10670,6 @@ Item* Player::StoreNewItem(ItemPosCountVec const& pos, uint32 itemId, bool updat
for (ItemPosCountVec::const_iterator itr = pos.begin(); itr != pos.end(); ++itr)
count += itr->count;
- // quest objectives must be processed twice - QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM prevents item creation
- // Classic Only - This feature has been disabled
- // bool hadBoundItemObjective = false;
- // ItemAddedQuestCheck(itemId, count, true, &hadBoundItemObjective);
- // if (hadBoundItemObjective)
- // return nullptr;
-
Item* item = Item::CreateItem(itemId, count, context, this, bonusListIDs == nullptr);
if (item)
{
@@ -10705,7 +10684,7 @@ Item* Player::StoreNewItem(ItemPosCountVec const& pos, uint32 itemId, bool updat
item = StoreItem(pos, item, update);
- ItemAddedQuestCheck(itemId, count, false);
+ ItemAddedQuestCheck(itemId, count);
UpdateCriteria(CriteriaType::ObtainAnyItem, itemId, count);
UpdateCriteria(CriteriaType::AcquireItem, itemId, count);
@@ -13789,6 +13768,11 @@ bool Player::CanCompleteRepeatableQuest(Quest const* quest)
if (!CanTakeQuest(quest, false))
return false;
+ if (quest->HasQuestObjectiveType(QUEST_OBJECTIVE_ITEM))
+ for (QuestObjective const& obj : quest->GetObjectives())
+ if (obj.Type == QUEST_OBJECTIVE_ITEM && !HasItemCount(obj.ObjectID, obj.Amount))
+ return false;
+
if (!CanRewardQuest(quest, false))
return false;
@@ -13822,7 +13806,7 @@ bool Player::CanRewardQuest(Quest const* quest, bool msg) const
{
for (QuestObjective const& obj : quest->GetObjectives())
{
- if (obj.Type != QUEST_OBJECTIVE_ITEM || obj.Flags2 & QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM)
+ if (obj.Type != QUEST_OBJECTIVE_ITEM)
continue;
if (GetItemCount(obj.ObjectID) < uint32(obj.Amount))
@@ -15531,13 +15515,12 @@ void Player::AdjustQuestObjectiveProgress(Quest const* quest)
switch (obj.Type)
{
case QUEST_OBJECTIVE_ITEM:
- if (!(obj.Flags2 & QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM))
- {
- uint32 reqItemCount = obj.Amount;
- uint32 curItemCount = GetItemCount(obj.ObjectID, true);
- SetQuestObjectiveData(obj, std::min(curItemCount, reqItemCount));
- }
+ {
+ uint32 reqItemCount = obj.Amount;
+ uint32 curItemCount = GetItemCount(obj.ObjectID, true);
+ SetQuestObjectiveData(obj, std::min(curItemCount, reqItemCount));
break;
+ }
case QUEST_OBJECTIVE_HAVE_CURRENCY:
{
uint32 reqCurrencyCount = obj.Amount;
@@ -15716,39 +15699,9 @@ void Player::GroupEventHappens(uint32 questId, WorldObject const* pEventObject)
AreaExploredOrEventHappens(questId);
}
-namespace
+void Player::ItemAddedQuestCheck(uint32 entry, uint32 count)
{
-struct
-{
- std::function<bool(QuestObjective const*)> QuestBoundItem = [](QuestObjective const* objective) { return (objective->Flags2 & QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM) != 0; };
- std::function<bool(QuestObjective const*)> NotQuestBoundItem = [](QuestObjective const* objective) { return (objective->Flags2 & QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM) == 0; };
-} const ItemQuestObjectiveFilters;
-}
-
-void Player::ItemAddedQuestCheck(uint32 entry, uint32 count, Optional<bool> boundItemFlagRequirement /*= {}*/, bool* hadBoundItemObjective /*= nullptr*/)
-{
- std::vector<QuestObjective const*> updatedObjectives;
- std::function<bool(QuestObjective const*)> const* objectiveFilter = nullptr;
- if (boundItemFlagRequirement)
- objectiveFilter = *boundItemFlagRequirement ? &ItemQuestObjectiveFilters.QuestBoundItem : &ItemQuestObjectiveFilters.NotQuestBoundItem;
-
- ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(entry);
- UpdateQuestObjectiveProgress(QUEST_OBJECTIVE_ITEM, itemTemplate->GetId(), count, ObjectGuid::Empty, &updatedObjectives, objectiveFilter);
- if (itemTemplate->QuestLogItemId && (updatedObjectives.size() != 1 || !(updatedObjectives[0]->Flags2 & QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM)))
- UpdateQuestObjectiveProgress(QUEST_OBJECTIVE_ITEM, itemTemplate->QuestLogItemId, count, ObjectGuid::Empty, &updatedObjectives, objectiveFilter);
-
- if (updatedObjectives.size() == 1 && updatedObjectives[0]->Flags2 & QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM)
- {
- // Quest source items should ignore QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM
- if (Quest const* quest = sObjectMgr->GetQuestTemplate(updatedObjectives[0]->QuestID))
- if (quest->GetSrcItemId() == entry)
- return;
-
- if (hadBoundItemObjective)
- *hadBoundItemObjective = updatedObjectives.size() == 1 && updatedObjectives[0]->Flags2 & QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM;
-
- SendQuestUpdateAddItem(itemTemplate, *updatedObjectives[0], count);
- }
+ UpdateQuestObjectiveProgress(QUEST_OBJECTIVE_ITEM, entry, count);
}
void Player::ItemRemovedQuestCheck(uint32 entry, uint32 /*count*/)
@@ -15844,8 +15797,7 @@ void Player::CurrencyChanged(uint32 currencyId, int32 change)
UpdateQuestObjectiveProgress(QUEST_OBJECTIVE_OBTAIN_CURRENCY, currencyId, change);
}
-void Player::UpdateQuestObjectiveProgress(QuestObjectiveType objectiveType, int32 objectId, int64 addCount, ObjectGuid victimGuid /*= ObjectGuid::Empty*/,
- std::vector<QuestObjective const*>* updatedObjectives /*= nullptr*/, std::function<bool(QuestObjective const*)> const* objectiveFilter /*= nullptr*/)
+void Player::UpdateQuestObjectiveProgress(QuestObjectiveType objectiveType, int32 objectId, int64 addCount, ObjectGuid victimGuid /*= ObjectGuid::Empty*/)
{
bool anyObjectiveChangedCompletionState = false;
bool updatePhaseShift = false;
@@ -15875,9 +15827,6 @@ void Player::UpdateQuestObjectiveProgress(QuestObjectiveType objectiveType, int3
if (objectiveWasComplete && addCount >= 0)
continue;
- if (objectiveFilter && !(*objectiveFilter)(objective))
- continue;
-
bool objectiveIsNowComplete = false;
if (objective->IsStoringValue())
{
@@ -15985,12 +15934,6 @@ void Player::UpdateQuestObjectiveProgress(QuestObjectiveType objectiveType, int3
}
else if (!(objective->Flags & QUEST_OBJECTIVE_FLAG_OPTIONAL) && objectiveItr.second.QuestStatusItr->second.Status == QUEST_STATUS_COMPLETE)
IncompleteQuest(questId);
-
- if (updatedObjectives)
- updatedObjectives->push_back(objective);
-
- if (objective->Type == QUEST_OBJECTIVE_ITEM && addCount >= 0 && objective->Flags2 & QUEST_OBJECTIVE_FLAG_2_QUEST_BOUND_ITEM)
- break;
}
if (anyObjectiveChangedCompletionState)
@@ -16433,26 +16376,6 @@ void Player::SendQuestUpdateAddCreditSimple(QuestObjective const& obj) const
SendDirectMessage(packet.Write());
}
-void Player::SendQuestUpdateAddItem(ItemTemplate const* itemTemplate, QuestObjective const& obj, uint16 count) const
-{
- WorldPackets::Item::ItemPushResult packet;
-
- packet.PlayerGUID = GetGUID();
-
- packet.Slot = INVENTORY_SLOT_BAG_0;
- packet.SlotInBag = 0;
- packet.Item.ItemID = itemTemplate->GetId();
- packet.QuestLogItemID = itemTemplate->QuestLogItemId;
- packet.Quantity = count;
- packet.QuantityInInventory = GetQuestObjectiveData(obj);
- packet.DisplayText = static_cast<WorldPackets::Item::ItemPushResult::DisplayType>(3);
-
- if (GetGroup() && !itemTemplate->HasFlag(ITEM_FLAG3_DONT_REPORT_LOOT_LOG_TO_PARTY))
- GetGroup()->BroadcastPacket(packet.Write(), true);
- else
- SendDirectMessage(packet.Write());
-}
-
void Player::SendQuestUpdateAddPlayer(Quest const* quest, uint16 newCount) const
{
WorldPackets::Quest::QuestUpdateAddPvPCredit questUpdateAddPvpCredit;
@@ -25587,12 +25510,13 @@ void Player::StoreLootItem(ObjectGuid lootWorldObjectGuid, uint8 lootSlot, Loot*
--loot->unlootedCount;
- if (newitem && (newitem->GetQuality() > ITEM_QUALITY_EPIC || (newitem->GetQuality() == ITEM_QUALITY_EPIC && newitem->GetItemLevel(this) >= MinNewsItemLevel)))
- if (Guild* guild = GetGuild())
- guild->AddGuildNews(GUILD_NEWS_ITEM_LOOTED, GetGUID(), 0, item->itemid);
+ if (sObjectMgr->GetItemTemplate(item->itemid))
+ if (newitem->GetQuality() > ITEM_QUALITY_EPIC || (newitem->GetQuality() == ITEM_QUALITY_EPIC && newitem->GetItemLevel(this) >= MinNewsItemLevel))
+ if (Guild* guild = GetGuild())
+ guild->AddGuildNews(GUILD_NEWS_ITEM_LOOTED, GetGUID(), 0, item->itemid);
// if aeLooting then we must delay sending out item so that it appears properly stacked in chat
- if (!aeResult || !newitem)
+ if (!aeResult)
{
SendNewItem(newitem, uint32(item->count), false, false, true, loot->GetDungeonEncounterId());
UpdateCriteria(CriteriaType::LootItem, item->itemid, item->count);
@@ -25606,10 +25530,7 @@ void Player::StoreLootItem(ObjectGuid lootWorldObjectGuid, uint8 lootSlot, Loot*
if (loot->loot_type == LOOT_ITEM)
sLootItemStorage->RemoveStoredLootItemForContainer(lootWorldObjectGuid.GetCounter(), item->itemid, item->count, item->LootListId);
- if (newitem)
- ApplyItemLootedSpell(newitem, true);
- else
- ApplyItemLootedSpell(sObjectMgr->GetItemTemplate(item->itemid));
+ ApplyItemLootedSpell(newitem, true);
}
else
SendEquipError(msg, nullptr, nullptr, item->itemid);
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index c648b70fe39..03ec4aa199d 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1626,7 +1626,7 @@ class TC_GAME_API Player final : public Unit, public GridObject<Player>
uint16 GetReqKillOrCastCurrentCount(uint32 quest_id, int32 entry) const;
void AreaExploredOrEventHappens(uint32 questId);
void GroupEventHappens(uint32 questId, WorldObject const* pEventObject);
- void ItemAddedQuestCheck(uint32 entry, uint32 count, Optional<bool> boundItemFlagRequirement = {}, bool* hadBoundItemObjective = nullptr);
+ void ItemAddedQuestCheck(uint32 entry, uint32 count);
void ItemRemovedQuestCheck(uint32 entry, uint32 count);
void KilledMonster(CreatureTemplate const* cInfo, ObjectGuid guid);
void KilledMonsterCredit(uint32 entry, ObjectGuid guid = ObjectGuid::Empty);
@@ -1637,8 +1637,7 @@ class TC_GAME_API Player final : public Unit, public GridObject<Player>
void MoneyChanged(uint64 value);
void ReputationChanged(FactionEntry const* factionEntry, int32 change);
void CurrencyChanged(uint32 currencyId, int32 change);
- void UpdateQuestObjectiveProgress(QuestObjectiveType objectiveType, int32 objectId, int64 addCount, ObjectGuid victimGuid = ObjectGuid::Empty,
- std::vector<QuestObjective const*>* updatedObjectives = nullptr, std::function<bool(QuestObjective const*)> const* objectiveFilter = nullptr);
+ void UpdateQuestObjectiveProgress(QuestObjectiveType objectiveType, int32 objectId, int64 addCount, ObjectGuid victimGuid = ObjectGuid::Empty);
bool HasQuestForItem(uint32 itemId) const;
QuestObjective const* GetQuestObjectiveForItem(uint32 itemId, bool onlyIncomplete) const;
bool HasQuestForGO(int32 goId) const;
@@ -1660,7 +1659,6 @@ class TC_GAME_API Player final : public Unit, public GridObject<Player>
void SendPushToPartyResponse(Player const* player, QuestPushReason reason, Quest const* quest = nullptr) const;
void SendQuestUpdateAddCredit(Quest const* quest, ObjectGuid guid, QuestObjective const& obj, uint16 count) const;
void SendQuestUpdateAddCreditSimple(QuestObjective const& obj) const;
- void SendQuestUpdateAddItem(ItemTemplate const* itemTemplate, QuestObjective const& obj, uint16 count) const;
void SendQuestUpdateAddPlayer(Quest const* quest, uint16 newCount) const;
void SendQuestGiverStatusMultiple();
void SendQuestGiverStatusMultiple(GuidUnorderedSet const& guids);
@@ -2335,7 +2333,6 @@ class TC_GAME_API Player final : public Unit, public GridObject<Player>
void CastItemCombatSpell(DamageInfo const& damageInfo, Item* item, ItemTemplate const* proto);
void CastItemUseSpell(Item* item, SpellCastTargets const& targets, ObjectGuid castCount, int32* misc);
void ApplyItemLootedSpell(Item* item, bool apply);
- void ApplyItemLootedSpell(ItemTemplate const* itemTemplate);
void SendEquipmentSetList();
void SetEquipmentSet(EquipmentSetInfo::EquipmentSetData const& newEqSet);
diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp
index 1ce22cf173d..a810b5a0b33 100644
--- a/src/server/game/Handlers/LootHandler.cpp
+++ b/src/server/game/Handlers/LootHandler.cpp
@@ -464,10 +464,8 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPackets::Loot::MasterLootItem
}
// now move item from loot to target inventory
- if (Item* newitem = target->StoreNewItem(dest, item.itemid, true, item.randomBonusListId, item.GetAllowedLooters(), item.context, &item.BonusListIDs))
- aeResult.Add(newitem, item.count, loot->loot_type, loot->GetDungeonEncounterId());
- else
- target->ApplyItemLootedSpell(sObjectMgr->GetItemTemplate(item.itemid));
+ Item* newitem = target->StoreNewItem(dest, item.itemid, true, item.randomBonusListId, item.GetAllowedLooters(), item.context, &item.BonusListIDs);
+ aeResult.Add(newitem, item.count, loot->loot_type, loot->GetDungeonEncounterId());
// mark as looted
item.count = 0;
diff --git a/src/server/game/Handlers/VoidStorageHandler.cpp b/src/server/game/Handlers/VoidStorageHandler.cpp
index 1d143c8a820..cafa7070c3e 100644
--- a/src/server/game/Handlers/VoidStorageHandler.cpp
+++ b/src/server/game/Handlers/VoidStorageHandler.cpp
@@ -187,12 +187,10 @@ void WorldSession::HandleVoidStorageTransfer(WorldPackets::VoidStorage::VoidStor
return;
}
- if (Item* item = _player->StoreNewItem(dest, itemVS->ItemEntry, true, itemVS->RandomBonusListId, GuidSet(), itemVS->Context, &itemVS->BonusListIDs))
- {
- item->SetCreator(itemVS->CreatorGuid);
- item->SetBinding(true);
- GetCollectionMgr()->AddItemAppearance(item);
- }
+ Item* item = _player->StoreNewItem(dest, itemVS->ItemEntry, true, itemVS->RandomBonusListId, GuidSet(), itemVS->Context, &itemVS->BonusListIDs);
+ item->SetCreator(itemVS->CreatorGuid);
+ item->SetBinding(true);
+ GetCollectionMgr()->AddItemAppearance(item);
voidStorageTransferChanges.RemovedItems.push_back(ObjectGuid::Create<HighGuid::Item>(itemVS->ItemId));
diff --git a/src/server/game/Loot/Loot.cpp b/src/server/game/Loot/Loot.cpp
index 3c9f0b4f643..dd4c16e6202 100644
--- a/src/server/game/Loot/Loot.cpp
+++ b/src/server/game/Loot/Loot.cpp
@@ -888,13 +888,9 @@ bool Loot::AutoStore(Player* player, uint8 bag, uint8 slot, bool broadcast, bool
--unlootedCount;
- if (Item* pItem = player->StoreNewItem(dest, lootItem->itemid, true, lootItem->randomBonusListId, GuidSet(), lootItem->context, &lootItem->BonusListIDs))
- {
- player->SendNewItem(pItem, lootItem->count, false, createdByPlayer, broadcast, GetDungeonEncounterId());
- player->ApplyItemLootedSpell(pItem, true);
- }
- else
- player->ApplyItemLootedSpell(sObjectMgr->GetItemTemplate(lootItem->itemid));
+ Item* pItem = player->StoreNewItem(dest, lootItem->itemid, true, lootItem->randomBonusListId, GuidSet(), lootItem->context, &lootItem->BonusListIDs);
+ player->SendNewItem(pItem, lootItem->count, false, createdByPlayer, broadcast);
+ player->ApplyItemLootedSpell(pItem, true);
}
return allLooted;
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 4e399d481d7..05f4865fb2e 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -5030,8 +5030,13 @@ void AuraEffect::HandleChannelDeathItem(AuraApplication const* aurApp, uint8 mod
return;
}
- if (Item* newitem = plCaster->StoreNewItem(dest, GetSpellEffectInfo().ItemType, true))
- plCaster->SendNewItem(newitem, count, true, true);
+ Item* newitem = plCaster->StoreNewItem(dest, GetSpellEffectInfo().ItemType, true);
+ if (!newitem)
+ {
+ plCaster->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr);
+ return;
+ }
+ plCaster->SendNewItem(newitem, count, true, true);
}
void AuraEffect::HandleBindSight(AuraApplication const* aurApp, uint8 mode, bool apply) const
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 262308b72fa..4b2c9d6f2a2 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -1398,23 +1398,28 @@ void Spell::DoCreateItem(uint32 itemId, ItemContext context /*= ItemContext::NON
if (num_to_add)
{
// create the new item and store it
- if (Item* pItem = player->StoreNewItem(dest, newitemid, true, GenerateItemRandomBonusListId(newitemid), GuidSet(), context, bonusListIDs))
+ Item* pItem = player->StoreNewItem(dest, newitemid, true, GenerateItemRandomBonusListId(newitemid), GuidSet(), context, bonusListIDs);
+
+ // was it successful? return error if not
+ if (!pItem)
{
- // set the "Crafted by ..." property of the item
- if (pItem->GetTemplate()->HasSignature())
- pItem->SetCreator(player->GetGUID());
+ player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, nullptr, nullptr);
+ return;
+ }
- // send info to the client
- player->SendNewItem(pItem, num_to_add, true, true);
+ // set the "Crafted by ..." property of the item
+ if (pItem->GetTemplate()->HasSignature())
+ pItem->SetCreator(player->GetGUID());
- if (pItem->GetQuality() > ITEM_QUALITY_EPIC || (pItem->GetQuality() == ITEM_QUALITY_EPIC && pItem->GetItemLevel(player) >= MinNewsItemLevel))
- if (Guild* guild = player->GetGuild())
- guild->AddGuildNews(GUILD_NEWS_ITEM_CRAFTED, player->GetGUID(), 0, pProto->GetId());
- }
+ // send info to the client
+ player->SendNewItem(pItem, num_to_add, true, true);
+
+ if (pItem->GetQuality() > ITEM_QUALITY_EPIC || (pItem->GetQuality() == ITEM_QUALITY_EPIC && pItem->GetItemLevel(player) >= MinNewsItemLevel))
+ if (Guild* guild = player->GetGuild())
+ guild->AddGuildNews(GUILD_NEWS_ITEM_CRAFTED, player->GetGUID(), 0, pProto->GetId());
// we succeeded in creating at least one item, so a levelup is possible
- if (!m_CastItem)
- player->UpdateCraftSkill(m_spellInfo);
+ player->UpdateCraftSkill(m_spellInfo);
}
}