Skip to content

Commit fa4b904

Browse files
committed
Core/Misc: Reduce differences between branches - skill updatefield accessors
1 parent 042a698 commit fa4b904

File tree

6 files changed

+99
-100
lines changed

6 files changed

+99
-100
lines changed

src/server/game/Entities/Item/Container/Bag.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ bool Bag::Create(ObjectGuid::LowType guidlow, uint32 itemid, Player const* owner
8282

8383
if (owner)
8484
{
85-
SetGuidValue(ITEM_FIELD_OWNER, owner->GetGUID());
85+
SetOwnerGUID(owner->GetGUID());
8686
SetGuidValue(ITEM_FIELD_CONTAINED, owner->GetGUID());
8787
}
8888

@@ -96,7 +96,7 @@ bool Bag::Create(ObjectGuid::LowType guidlow, uint32 itemid, Player const* owner
9696
// Cleaning 20 slots
9797
for (uint8 i = 0; i < MAX_BAG_SIZE; ++i)
9898
{
99-
SetGuidValue(CONTAINER_FIELD_SLOT_1 + (i*2), ObjectGuid::Empty);
99+
SetGuidValue(CONTAINER_FIELD_SLOT_1 + (i * 2), ObjectGuid::Empty);
100100
m_bagslot[i] = nullptr;
101101
}
102102

@@ -165,7 +165,7 @@ void Bag::StoreItem(uint8 slot, Item* pItem, bool /*update*/)
165165
m_bagslot[slot] = pItem;
166166
SetGuidValue(CONTAINER_FIELD_SLOT_1 + (slot * 2), pItem->GetGUID());
167167
pItem->SetGuidValue(ITEM_FIELD_CONTAINED, GetGUID());
168-
pItem->SetGuidValue(ITEM_FIELD_OWNER, GetOwnerGUID());
168+
pItem->SetOwnerGUID(GetOwnerGUID());
169169
pItem->SetContainer(this);
170170
pItem->SetSlot(slot);
171171
}

src/server/game/Entities/Item/Item.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ bool Item::Create(ObjectGuid::LowType guidlow, uint32 itemId, Player const* owne
273273

274274
if (owner)
275275
{
276-
SetGuidValue(ITEM_FIELD_OWNER, owner->GetGUID());
276+
SetOwnerGUID(owner->GetGUID());
277277
SetGuidValue(ITEM_FIELD_CONTAINED, owner->GetGUID());
278278
}
279279

0 commit comments

Comments
 (0)