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

Core/PacketIO: Fixed areatrigger curve updatefields structure

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/0c3e69d5f57cccead08b4ebe3767050f9e1687f5)
This commit is contained in:
hondacrx
2019-10-24 16:41:03 -04:00
parent c4ecfc9f02
commit 1061de00d4
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Object/Update/UpdateFields.cs
+6 -14
View File
@@ -208,7 +208,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Item owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Item owner, Player receiver)
{ {
data.FlushBits();
data.WriteUInt16(ArtifactPowerId); data.WriteUInt16(ArtifactPowerId);
data.WriteUInt8(PurchasedRank); data.WriteUInt8(PurchasedRank);
data.WriteUInt8(CurrentRankWithBonus); data.WriteUInt8(CurrentRankWithBonus);
@@ -649,7 +648,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Item owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Item owner, Player receiver)
{ {
data.FlushBits();
data.WriteUInt32(AzeriteEssenceID); data.WriteUInt32(AzeriteEssenceID);
data.WriteUInt32(Rank); data.WriteUInt32(Rank);
} }
@@ -865,7 +863,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Unit owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Unit owner, Player receiver)
{ {
data.FlushBits();
data.WriteUInt32(SpellID); data.WriteUInt32(SpellID);
data.WriteUInt32(SpellXSpellVisualID); data.WriteUInt32(SpellXSpellVisualID);
} }
@@ -928,7 +925,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Unit owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Unit owner, Player receiver)
{ {
data.FlushBits();
data.WriteInt32(SpellID); data.WriteInt32(SpellID);
data.WriteInt32(AuraSpellID); data.WriteInt32(AuraSpellID);
} }
@@ -2774,7 +2770,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver)
{ {
data.FlushBits();
data.WriteInt32(Field_0); data.WriteInt32(Field_0);
data.WriteInt32(Field_4); data.WriteInt32(Field_4);
data.WriteInt32(Field_8); data.WriteInt32(Field_8);
@@ -2797,7 +2792,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver)
{ {
data.FlushBits();
data.WriteInt32(ModIndex); data.WriteInt32(ModIndex);
data.WriteFloat(ModifierValue); data.WriteFloat(ModifierValue);
data.WriteInt32(LabelID); data.WriteInt32(LabelID);
@@ -2818,7 +2812,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver)
{ {
data.FlushBits();
data.WriteInt32(ModIndex); data.WriteInt32(ModIndex);
data.WriteInt32(ModifierValue); data.WriteInt32(ModifierValue);
data.WriteInt32(LabelID); data.WriteInt32(LabelID);
@@ -2835,7 +2828,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Player owner, Player receiver)
{ {
data.FlushBits();
data.WriteInt16(ResearchProjectID); data.WriteInt16(ResearchProjectID);
} }
} }
@@ -4518,17 +4510,19 @@ namespace Game.Entities
public override void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, AreaTrigger owner, Player receiver) public override void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, AreaTrigger owner, Player receiver)
{ {
UpdateMask changesMask = _changesMask; UpdateMask changesMask = _changesMask;
data.WriteBits(changesMask.GetBlocksMask(0), 1); data.WriteBits(changesMask.GetBlock(0), 7);
if (changesMask.GetBlock(0) != 0)
data.WriteBits(changesMask.GetBlock(0), 32);
if (changesMask[0]) if (changesMask[0])
{ {
if (changesMask[1]) if (changesMask[1])
{ {
data.WriteBit(OverrideActive); data.WriteBit(OverrideActive);
data.FlushBits();
} }
}
data.FlushBits();
if (changesMask[0])
{
if (changesMask[2]) if (changesMask[2])
{ {
data.WriteUInt32(StartTimeOffset); data.WriteUInt32(StartTimeOffset);
@@ -4746,7 +4740,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Conversation owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Conversation owner, Player receiver)
{ {
data.FlushBits();
data.WriteUInt32(ConversationLineID); data.WriteUInt32(ConversationLineID);
data.WriteUInt32(StartTime); data.WriteUInt32(StartTime);
data.WriteUInt32(UiCameraID); data.WriteUInt32(UiCameraID);
@@ -4774,7 +4767,6 @@ namespace Game.Entities
} }
public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Conversation owner, Player receiver) public void WriteUpdate(WorldPacket data, UpdateFieldFlag fieldVisibilityFlags, Conversation owner, Player receiver)
{ {
data.FlushBits();
data.WriteUInt32(CreatureID); data.WriteUInt32(CreatureID);
data.WriteUInt32(CreatureDisplayInfoID); data.WriteUInt32(CreatureDisplayInfoID);
data.WritePackedGuid(ActorGUID); data.WritePackedGuid(ActorGUID);