diff --git a/WowPacketParserModule.V4_4_0_54481/Parsers/CalenderHandler.cs b/WowPacketParserModule.V4_4_0_54481/Parsers/CalenderHandler.cs index 771a01726c..26d07720fe 100644 --- a/WowPacketParserModule.V4_4_0_54481/Parsers/CalenderHandler.cs +++ b/WowPacketParserModule.V4_4_0_54481/Parsers/CalenderHandler.cs @@ -28,10 +28,19 @@ public static void ReadCalendarSendCalendarEventInfo(Packet packet, params objec packet.ReadByte("EventType", indexes); packet.ReadInt32("Date", indexes); - packet.ReadInt32("Flags", indexes); + + if (ClientVersion.AddedInVersion(ClientVersionBuild.V4_4_1_57294)) + packet.ReadUInt16E("Flags"); + else + packet.ReadInt32E("Flags"); + packet.ReadInt32("TextureID", indexes); - packet.ReadPackedGuid128("EventGuildID", indexes); + if (ClientVersion.AddedInVersion(ClientVersionBuild.V4_4_1_57294)) + packet.ReadUInt64("EventClubID"); + else + packet.ReadPackedGuid128("EventGuildID"); + packet.ReadPackedGuid128("OwnerGUID", indexes); packet.ResetBitReader(); @@ -178,7 +187,12 @@ public static void HandleCalendarEventUpdateAlert(Packet packet) packet.ReadPackedTime("OriginalDate"); packet.ReadPackedTime("Date"); packet.ReadUInt32("LockDate"); - packet.ReadUInt32E("Flags"); + + if (ClientVersion.AddedInVersion(ClientVersionBuild.V4_4_1_57294)) + packet.ReadUInt16E("Flags"); + else + packet.ReadUInt32E("Flags"); + packet.ReadUInt32("TextureID"); packet.ReadByte("EventType"); @@ -209,7 +223,12 @@ public static void HandleCalendarEventInviteAlert(Packet packet) { packet.ReadUInt64("EventID"); packet.ReadPackedTime("Date"); - packet.ReadInt32E("Flags"); + + if (ClientVersion.AddedInVersion(ClientVersionBuild.V4_4_1_57294)) + packet.ReadUInt16E("Flags"); + else + packet.ReadInt32E("Flags"); + packet.ReadByteE("EventType"); packet.ReadInt32("TextureID"); packet.ReadUInt64("EventClubID"); @@ -222,6 +241,8 @@ public static void HandleCalendarEventInviteAlert(Packet packet) packet.ReadPackedGuid128("OwnerGUID | InvitedByGUID"); var eventNameLength = packet.ReadBits("EventNameLength", 8); + if (ClientVersion.AddedInVersion(ClientVersionBuild.V4_4_1_57294)) + packet.ReadBit("Unknown_1100"); packet.ResetBitReader(); packet.ReadWoWString("EventName", eventNameLength); @@ -356,7 +377,12 @@ public static void HandleCalendarSendEvent(Packet packet) packet.ReadUInt64("EventID"); packet.ReadByte("GetEventType"); packet.ReadInt32("TextureID"); - packet.ReadUInt32("Flags"); + + if (ClientVersion.AddedInVersion(ClientVersionBuild.V4_4_1_57294)) + packet.ReadUInt16E("Flags"); + else + packet.ReadInt32E("Flags"); + packet.ReadPackedTime("Date"); packet.ReadUInt32("LockDate"); packet.ReadUInt64("EventClubID");