Core/Objects: More minor refactors for SMSG_UPDATE_OBJECT building - move getting and writing field flags to shared function

Port From (https://github.com/TrinityCore/TrinityCore/commit/ee54ade3975748bf373162b2397328852dec6701)
This commit is contained in:
Hondacrx
2024-11-11 12:32:44 -05:00
parent a3edaf4df6
commit 6fcce1a6e4
13 changed files with 33 additions and 86 deletions
@@ -146,20 +146,15 @@ namespace Game.Entities
return (long)PlayerConst.MaxMoneyAmount + 1;
}
public override void BuildValuesCreate(WorldPacket data, Player target)
public override void BuildValuesCreate(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
data.WriteUInt8((byte)flags);
m_objectData.WriteCreate(data, flags, this, target);
m_itemData.WriteCreate(data, flags, this, target);
m_azeriteEmpoweredItemData.WriteCreate(data, flags, this, target);
}
public override void BuildValuesUpdate(WorldPacket data, Player target)
public override void BuildValuesUpdate(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
data.WriteUInt32(m_values.GetChangedObjectTypeMask());
if (m_values.HasChanged(TypeId.Object))
m_objectData.WriteUpdate(data, flags, this, target);
+2 -7
View File
@@ -404,20 +404,15 @@ namespace Game.Entities
SetUpdateFieldValue(ref selectedEssences.ModifyValue(selectedEssences.AzeriteEssenceID, slot), azeriteEssenceId);
}
public override void BuildValuesCreate(WorldPacket data, Player target)
public override void BuildValuesCreate(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
data.WriteUInt8((byte)flags);
m_objectData.WriteCreate(data, flags, this, target);
m_itemData.WriteCreate(data, flags, this, target);
m_azeriteItemData.WriteCreate(data, flags, this, target);
}
public override void BuildValuesUpdate(WorldPacket data, Player target)
public override void BuildValuesUpdate(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
data.WriteUInt32(m_values.GetChangedObjectTypeMask());
if (m_values.HasChanged(TypeId.Object))
m_objectData.WriteUpdate(data, flags, this, target);
+2 -7
View File
@@ -160,20 +160,15 @@ namespace Game.Entities
m_bagslot[i].BuildCreateUpdateBlockForPlayer(data, target);
}
public override void BuildValuesCreate(WorldPacket data, Player target)
public override void BuildValuesCreate(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
data.WriteUInt8((byte)flags);
m_objectData.WriteCreate(data, flags, this, target);
m_itemData.WriteCreate(data, flags, this, target);
m_containerData.WriteCreate(data, flags, this, target);
}
public override void BuildValuesUpdate(WorldPacket data, Player target)
public override void BuildValuesUpdate(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
data.WriteUInt32(m_values.GetChangedObjectTypeMask());
if (m_values.HasChanged(TypeId.Object))
m_objectData.WriteUpdate(data, flags, this, target);
+2 -7
View File
@@ -1270,19 +1270,14 @@ namespace Game.Entities
return UpdateFieldFlag.None;
}
public override void BuildValuesCreate(WorldPacket data, Player target)
public override void BuildValuesCreate(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
data.WriteUInt8((byte)flags);
m_objectData.WriteCreate(data, flags, this, target);
m_itemData.WriteCreate(data, flags, this, target);
}
public override void BuildValuesUpdate(WorldPacket data, Player target)
public override void BuildValuesUpdate(WorldPacket data, UpdateFieldFlag flags, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
data.WriteUInt32(m_values.GetChangedObjectTypeMask());
if (m_values.HasChanged(TypeId.Object))
m_objectData.WriteUpdate(data, flags, this, target);