diff options
| author | Gosha <284210+Lordron@users.noreply.github.com> | 2022-10-11 23:18:54 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-10-13 12:37:18 +0200 |
| commit | c1a9d7a3bc174ca27fbca71d1328dac60380e33b (patch) | |
| tree | 7dbf87b85a71fbda4a242fd0b7f7dd990b1ceb53 /src/server/game/Entities/Item | |
| parent | 76631d0950d95c66586450a2d934c5101fba80e3 (diff) | |
Core/PacketIO: Use ByteBuffer from UpdateData instead of copying to it after (#28347)
(cherry picked from commit 81bf8de9895e050d5800a8a37316c0e6874b5e40)
Diffstat (limited to 'src/server/game/Entities/Item')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.cpp b/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.cpp index 7ec63620a4f..552e5075603 100644 --- a/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.cpp +++ b/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.cpp @@ -201,7 +201,7 @@ void AzeriteEmpoweredItem::BuildValuesUpdateForPlayerWithMask(UpdateData* data, if (requestedAzeriteEmpoweredItemMask.IsAnySet()) valuesMask.Set(TYPEID_AZERITE_EMPOWERED_ITEM); - ByteBuffer buffer = PrepareValuesUpdateBuffer(); + ByteBuffer& buffer = PrepareValuesUpdateBuffer(data); std::size_t sizePos = buffer.wpos(); buffer << uint32(0); buffer << uint32(valuesMask.GetBlock(0)); @@ -217,7 +217,7 @@ void AzeriteEmpoweredItem::BuildValuesUpdateForPlayerWithMask(UpdateData* data, buffer.put<uint32>(sizePos, buffer.wpos() - sizePos - 4); - data->AddUpdateBlock(buffer); + data->AddUpdateBlock(); } void AzeriteEmpoweredItem::ValuesUpdateForPlayerWithMaskSender::operator()(Player const* player) const diff --git a/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp b/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp index ae86e0ab97e..95f14602f25 100644 --- a/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp +++ b/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp @@ -462,7 +462,7 @@ void AzeriteItem::BuildValuesUpdateForPlayerWithMask(UpdateData* data, UF::Objec if (azeriteItemMask.IsAnySet()) valuesMask.Set(TYPEID_AZERITE_ITEM); - ByteBuffer buffer = PrepareValuesUpdateBuffer(); + ByteBuffer& buffer = PrepareValuesUpdateBuffer(data); std::size_t sizePos = buffer.wpos(); buffer << uint32(0); buffer << uint32(valuesMask.GetBlock(0)); @@ -478,7 +478,7 @@ void AzeriteItem::BuildValuesUpdateForPlayerWithMask(UpdateData* data, UF::Objec buffer.put<uint32>(sizePos, buffer.wpos() - sizePos - 4); - data->AddUpdateBlock(buffer); + data->AddUpdateBlock(); } void AzeriteItem::ValuesUpdateForPlayerWithMaskSender::operator()(Player const* player) const diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp index 53bd7b5d39f..b9c7855cc38 100644 --- a/src/server/game/Entities/Item/Container/Bag.cpp +++ b/src/server/game/Entities/Item/Container/Bag.cpp @@ -229,7 +229,7 @@ void Bag::BuildValuesUpdateForPlayerWithMask(UpdateData* data, UF::ObjectData::M if (requestedContainerMask.IsAnySet()) valuesMask.Set(TYPEID_CONTAINER); - ByteBuffer buffer = PrepareValuesUpdateBuffer(); + ByteBuffer& buffer = PrepareValuesUpdateBuffer(data); std::size_t sizePos = buffer.wpos(); buffer << uint32(0); buffer << uint32(valuesMask.GetBlock(0)); @@ -245,7 +245,7 @@ void Bag::BuildValuesUpdateForPlayerWithMask(UpdateData* data, UF::ObjectData::M buffer.put<uint32>(sizePos, buffer.wpos() - sizePos - 4); - data->AddUpdateBlock(buffer); + data->AddUpdateBlock(); } void Bag::ValuesUpdateForPlayerWithMaskSender::operator()(Player const* player) const diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 464706d5538..96399f9c00f 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -1748,7 +1748,7 @@ void Item::BuildValuesUpdateForPlayerWithMask(UpdateData* data, UF::ObjectData:: if (itemMask.IsAnySet()) valuesMask.Set(TYPEID_ITEM); - ByteBuffer buffer = PrepareValuesUpdateBuffer(); + ByteBuffer& buffer = PrepareValuesUpdateBuffer(data); std::size_t sizePos = buffer.wpos(); buffer << uint32(0); buffer << uint32(valuesMask.GetBlock(0)); @@ -1761,7 +1761,7 @@ void Item::BuildValuesUpdateForPlayerWithMask(UpdateData* data, UF::ObjectData:: buffer.put<uint32>(sizePos, buffer.wpos() - sizePos - 4); - data->AddUpdateBlock(buffer); + data->AddUpdateBlock(); } void Item::ValuesUpdateForPlayerWithMaskSender::operator()(Player const* player) const |