From 6828c7bc2f4e05e4a3d1480f2d8e72cebc6e0a14 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 7 May 2017 16:47:49 +0200 Subject: Core/Items: Implemented new item bonus and enchantment types --- src/server/game/Entities/Player/Player.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/game/Entities/Player') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 5c1c705a72d..c89c687adeb 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -11663,9 +11663,9 @@ Item* Player::_StoreItem(uint16 pos, Item* pItem, uint32 count, bool clone, bool if (!pItem) return nullptr; - if (pItem->GetTemplate()->GetBonding() == BIND_ON_ACQUIRE || - pItem->GetTemplate()->GetBonding() == BIND_QUEST || - (pItem->GetTemplate()->GetBonding() == BIND_ON_EQUIP && IsBagPos(pos))) + if (pItem->GetBonding() == BIND_ON_ACQUIRE || + pItem->GetBonding() == BIND_QUEST || + (pItem->GetBonding() == BIND_ON_EQUIP && IsBagPos(pos))) pItem->SetBinding(true); Bag* pBag = (bag == INVENTORY_SLOT_BAG_0) ? NULL : GetBagByPos(bag); @@ -11706,9 +11706,9 @@ Item* Player::_StoreItem(uint16 pos, Item* pItem, uint32 count, bool clone, bool } else { - if (pItem2->GetTemplate()->GetBonding() == BIND_ON_ACQUIRE || - pItem2->GetTemplate()->GetBonding() == BIND_QUEST || - (pItem2->GetTemplate()->GetBonding() == BIND_ON_EQUIP && IsBagPos(pos))) + if (pItem2->GetBonding() == BIND_ON_ACQUIRE || + pItem2->GetBonding() == BIND_QUEST || + (pItem2->GetBonding() == BIND_ON_EQUIP && IsBagPos(pos))) pItem2->SetBinding(true); pItem2->SetCount(pItem2->GetCount() + count); @@ -12016,7 +12016,7 @@ void Player::VisualizeItem(uint8 slot, Item* pItem) return; // check also BIND_ON_ACQUIRE and BIND_QUEST for .additem or .additemset case by GM (not binded at adding to inventory) - if (pItem->GetTemplate()->GetBonding() == BIND_ON_EQUIP || pItem->GetTemplate()->GetBonding() == BIND_ON_ACQUIRE || pItem->GetTemplate()->GetBonding() == BIND_QUEST) + if (pItem->GetBonding() == BIND_ON_EQUIP || pItem->GetBonding() == BIND_ON_ACQUIRE || pItem->GetBonding() == BIND_QUEST) { pItem->SetBinding(true); if (IsInWorld()) @@ -18332,7 +18332,7 @@ void Player::_LoadInventory(PreparedQueryResult result, PreparedQueryResult arti { auto artifactDataItr = artifactData.find(item->GetGUID()); if (item->GetTemplate()->GetArtifactID() && artifactDataItr != artifactData.end()) - item->LoadArtifactData(std::get<0>(artifactDataItr->second), std::get<1>(artifactDataItr->second), std::get<2>(artifactDataItr->second)); + item->LoadArtifactData(this, std::get<0>(artifactDataItr->second), std::get<1>(artifactDataItr->second), std::get<2>(artifactDataItr->second)); ObjectGuid bagGuid = fields[44].GetUInt64() ? ObjectGuid::Create(fields[44].GetUInt64()) : ObjectGuid::Empty; uint8 slot = fields[45].GetUInt8(); -- cgit v1.2.3