Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/PacketIO: Implement building SMSG_UPDATE_OBJECT only for selected fields and use that to fix quest objects not glowing after accepting quests

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/bbfbb7d4bfa869755e702b40b53dbd295f8c964d)
This commit is contained in:
hondacrx
2020-05-01 12:23:24 -04:00
parent e31ca45d54
commit 1224abafe8
17 changed files with 900 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Item/AzeriteEmpoweredItem.cs
+35
View File
@@ -195,6 +195,41 @@ namespace Game.Entities
data.WriteBytes(buffer);
}
void BuildValuesUpdateForPlayerWithMask(UpdateData data, UpdateMask requestedObjectMask, UpdateMask requestedItemMask, UpdateMask requestedAzeriteEmpoweredItemMask, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
UpdateMask valuesMask = new UpdateMask((int)TypeId.Max);
if (requestedObjectMask.IsAnySet())
valuesMask.Set((int)TypeId.Object);
m_itemData.FilterDisallowedFieldsMaskForFlag(requestedItemMask, flags);
if (requestedItemMask.IsAnySet())
valuesMask.Set((int)TypeId.Item);
if (requestedAzeriteEmpoweredItemMask.IsAnySet())
valuesMask.Set((int)TypeId.AzeriteEmpoweredItem);
WorldPacket buffer = new WorldPacket();
buffer.WriteUInt32(valuesMask.GetBlock(0));
if (valuesMask[(int)TypeId.Object])
m_objectData.WriteUpdate(buffer, requestedObjectMask, true, this, target);
if (valuesMask[(int)TypeId.Item])
m_itemData.WriteUpdate(buffer, requestedItemMask, true, this, target);
if (valuesMask[(int)TypeId.AzeriteEmpoweredItem])
m_azeriteEmpoweredItemData.WriteUpdate(buffer, requestedAzeriteEmpoweredItemMask, true, this, target);
WorldPacket buffer1 = new WorldPacket();
buffer1.WriteUInt8((byte)UpdateType.Values);
buffer1.WritePackedGuid(GetGUID());
buffer1.WriteUInt32(buffer.GetSize());
buffer1.WriteBytes(buffer.GetData());
data.AddUpdateBlock(buffer1);
}
public override void ClearUpdateMask(bool remove)
{
m_values.ClearChangesMask(m_azeriteEmpoweredItemData);
Source/Game/Entities/Item/AzeriteItem.cs
+38 -2
View File
@@ -467,16 +467,52 @@ namespace Game.Entities
UpdateMask mask = new UpdateMask(40);
m_itemData.AppendAllowedFieldsMaskForFlag(mask, flags);
m_itemData.WriteUpdate(buffer, mask, flags, this, target);
m_itemData.WriteUpdate(buffer, mask, true, this, target);
UpdateMask mask2 = new UpdateMask(9);
m_azeriteItemData.AppendAllowedFieldsMaskForFlag(mask2, flags);
m_azeriteItemData.WriteUpdate(buffer, mask2, flags, this, target);
m_azeriteItemData.WriteUpdate(buffer, mask2, true, this, target);
data.WriteUInt32(buffer.GetSize());
data.WriteBytes(buffer);
}
void BuildValuesUpdateForPlayerWithMask(UpdateData data, UpdateMask requestedObjectMask, UpdateMask requestedItemMask, UpdateMask requestedAzeriteItemMask, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
UpdateMask valuesMask = new UpdateMask((int)TypeId.Max);
if (requestedObjectMask.IsAnySet())
valuesMask.Set((int)TypeId.Object);
m_itemData.FilterDisallowedFieldsMaskForFlag(requestedItemMask, flags);
if (requestedItemMask.IsAnySet())
valuesMask.Set((int)TypeId.Item);
m_azeriteItemData.FilterDisallowedFieldsMaskForFlag(requestedAzeriteItemMask, flags);
if (requestedAzeriteItemMask.IsAnySet())
valuesMask.Set((int)TypeId.AzeriteItem);
WorldPacket buffer = new WorldPacket();
buffer.WriteUInt32(valuesMask.GetBlock(0));
if (valuesMask[(int)TypeId.Object])
m_objectData.WriteUpdate(buffer, requestedObjectMask, true, this, target);
if (valuesMask[(int)TypeId.Item])
m_itemData.WriteUpdate(buffer, requestedItemMask, true, this, target);
if (valuesMask[(int)TypeId.AzeriteItem])
m_azeriteItemData.WriteUpdate(buffer, requestedAzeriteItemMask, true, this, target);
WorldPacket buffer1 = new WorldPacket();
buffer1.WriteUInt8((byte)UpdateType.Values);
buffer1.WritePackedGuid(GetGUID());
buffer1.WriteUInt32(buffer.GetSize());
buffer1.WriteBytes(buffer.GetData());
data.AddUpdateBlock(buffer1);
}
public override void ClearUpdateMask(bool remove)
{
m_values.ClearChangesMask(m_azeriteItemData);
Source/Game/Entities/Item/Bag.cs
+35
View File
@@ -205,6 +205,41 @@ namespace Game.Entities
data.WriteBytes(buffer);
}
void BuildValuesUpdateForPlayerWithMask(UpdateData data, UpdateMask requestedObjectMask, UpdateMask requestedItemMask, UpdateMask requestedContainerMask, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
UpdateMask valuesMask = new UpdateMask((int)TypeId.Max);
if (requestedObjectMask.IsAnySet())
valuesMask.Set((int)TypeId.Object);
m_itemData.FilterDisallowedFieldsMaskForFlag(requestedItemMask, flags);
if (requestedItemMask.IsAnySet())
valuesMask.Set((int)TypeId.Item);
if (requestedContainerMask.IsAnySet())
valuesMask.Set((int)TypeId.Container);
WorldPacket buffer = new WorldPacket();
buffer.WriteUInt32(valuesMask.GetBlock(0));
if (valuesMask[(int)TypeId.Object])
m_objectData.WriteUpdate(buffer, requestedObjectMask, true, this, target);
if (valuesMask[(int)TypeId.Item])
m_itemData.WriteUpdate(buffer, requestedItemMask, true, this, target);
if (valuesMask[(int)TypeId.Container])
m_containerData.WriteUpdate(buffer, requestedContainerMask, true, this, target);
WorldPacket buffer1 = new WorldPacket();
buffer1.WriteUInt8((byte)UpdateType.Values);
buffer1.WritePackedGuid(GetGUID());
buffer1.WriteUInt32(buffer.GetSize());
buffer1.WriteBytes(buffer.GetData());
data.AddUpdateBlock(buffer1);
}
public override void ClearUpdateMask(bool remove)
{
m_values.ClearChangesMask(m_containerData);
Source/Game/Entities/Item/Item.cs
+30 -1
View File
@@ -1251,12 +1251,41 @@ namespace Game.Entities
buffer.WriteUInt32(valuesMask.GetBlock(0));
m_itemData.AppendAllowedFieldsMaskForFlag(mask, flags);
m_itemData.WriteUpdate(buffer, mask, flags, this, target);
m_itemData.WriteUpdate(buffer, mask, true, this, target);
data.WriteUInt32(buffer.GetSize());
data.WriteBytes(buffer);
}
void BuildValuesUpdateForPlayerWithMask(UpdateData data, UpdateMask requestedObjectMask, UpdateMask requestedItemMask, Player target)
{
UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target);
UpdateMask valuesMask = new UpdateMask((int)TypeId.Max);
if (requestedObjectMask.IsAnySet())
valuesMask.Set((int)TypeId.Object);
m_itemData.FilterDisallowedFieldsMaskForFlag(requestedItemMask, flags);
if (requestedItemMask.IsAnySet())
valuesMask.Set((int)TypeId.Item);
WorldPacket buffer = new WorldPacket();
buffer.WriteUInt32(valuesMask.GetBlock(0));
if (valuesMask[(int)TypeId.Object])
m_objectData.WriteUpdate(buffer, requestedObjectMask, true, this, target);
if (valuesMask[(int)TypeId.Item])
m_itemData.WriteUpdate(buffer, requestedItemMask, true, this, target);
WorldPacket buffer1 = new WorldPacket();
buffer1.WriteUInt8((byte)UpdateType.Values);
buffer1.WritePackedGuid(GetGUID());
buffer1.WriteUInt32(buffer.GetSize());
buffer1.WriteBytes(buffer.GetData());
data.AddUpdateBlock(buffer1);
}
public override void ClearUpdateMask(bool remove)
{
m_values.ClearChangesMask(m_itemData);