Also fix item updates for 3.4.1 and 3.4.2

killerwife · killerwife · commit 54007545d70d · 2025-04-11T21:57:06.000+02:00
diff --git a/WowPacketParserModule.V3_4_0_45166/Parsers/UpdateFieldsHandler341.cs b/WowPacketParserModule.V3_4_0_45166/Parsers/UpdateFieldsHandler341.cs
@@ -279,6 +279,7 @@ public override IItemData ReadCreateItemData(Packet packet, UpdateFieldFlag flag
         public override IItemData ReadUpdateItemData(Packet packet, params object[] indexes)
         {
             var data = new ItemData();
+            packet.ResetBitReader();
             var rawChangesMask = new int[2];
             var rawMaskMask = new int[1];
             rawMaskMask[0] = (int)packet.ReadBits(2);
@@ -291,147 +292,135 @@ public override IItemData ReadUpdateItemData(Packet packet, params object[] inde
             if (changesMask[0])
             {
                 if (changesMask[1])
-                {
-                    data.BonusListIDs = Enumerable.Range(0, (int)packet.ReadBits(32)).Select(x => new int()).Cast<System.Nullable<int>>().ToArray();
-                    for (var i = 0; i < data.BonusListIDs.Length; ++i)
-                    {
-                        data.BonusListIDs[i] = packet.ReadInt32("BonusListIDs", indexes, i);
-                    }
-                }
-            }
-            packet.ResetBitReader();
-            if (changesMask[0])
-            {
-                if (changesMask[2])
                 {
                     data.ArtifactPowers.ReadUpdateMask(packet);
                 }
-                if (changesMask[3])
+                if (changesMask[2])
                 {
                     data.Gems.ReadUpdateMask(packet);
                 }
             }
             packet.ResetBitReader();
             if (changesMask[0])
             {
-                if (changesMask[2])
+                if (changesMask[1])
                 {
                     for (var i = 0; i < data.ArtifactPowers.Count; ++i)
                     {
                         if (data.ArtifactPowers.UpdateMask[i])
                         {
-                            data.ArtifactPowers[i] = ReadUpdateArtifactPower(packet, data.ArtifactPowers[i] as ArtifactPower, indexes, "ArtifactPowers", i);
+                            data.ArtifactPowers[i] = ReadUpdateArtifactPower(packet, indexes, "ArtifactPowers", i);
                         }
                     }
                 }
-                if (changesMask[3])
+                if (changesMask[2])
                 {
                     for (var i = 0; i < data.Gems.Count; ++i)
                     {
                         if (data.Gems.UpdateMask[i])
                         {
-                            data.Gems[i] = ReadUpdateSocketedGem(packet, data.Gems[i] as SocketedGem, indexes, "Gems", i);
+                            data.Gems[i] = ReadUpdateSocketedGem(packet, indexes, "Gems", i);
                         }
                     }
                 }
-                if (changesMask[4])
+                if (changesMask[3])
                 {
                     data.Owner = packet.ReadPackedGuid128("Owner", indexes);
                 }
-                if (changesMask[5])
+                if (changesMask[4])
                 {
                     data.ContainedIn = packet.ReadPackedGuid128("ContainedIn", indexes);
                 }
-                if (changesMask[6])
+                if (changesMask[5])
                 {
                     data.Creator = packet.ReadPackedGuid128("Creator", indexes);
                 }
-                if (changesMask[7])
+                if (changesMask[6])
                 {
                     data.GiftCreator = packet.ReadPackedGuid128("GiftCreator", indexes);
                 }
-                if (changesMask[8])
+                if (changesMask[7])
                 {
                     data.StackCount = packet.ReadUInt32("StackCount", indexes);
                 }
-                if (changesMask[9])
+                if (changesMask[8])
                 {
                     data.Expiration = packet.ReadUInt32("Expiration", indexes);
                 }
-                if (changesMask[10])
+                if (changesMask[9])
                 {
                     data.DynamicFlags = packet.ReadUInt32("DynamicFlags", indexes);
                 }
-                if (changesMask[11])
+                if (changesMask[10])
                 {
                     data.PropertySeed = packet.ReadInt32("PropertySeed", indexes);
                 }
-                if (changesMask[12])
+                if (changesMask[11])
                 {
                     data.RandomPropertiesID = packet.ReadInt32("RandomPropertiesID", indexes);
                 }
-                if (changesMask[13])
+                if (changesMask[12])
                 {
                     data.Durability = packet.ReadUInt32("Durability", indexes);
                 }
-                if (changesMask[14])
+                if (changesMask[13])
                 {
                     data.MaxDurability = packet.ReadUInt32("MaxDurability", indexes);
                 }
-                if (changesMask[15])
+                if (changesMask[14])
                 {
                     data.CreatePlayedTime = packet.ReadUInt32("CreatePlayedTime", indexes);
                 }
-                if (changesMask[16])
+                if (changesMask[15])
                 {
                     data.Context = packet.ReadInt32("Context", indexes);
                 }
-                if (changesMask[17])
+                if (changesMask[16])
                 {
                     data.CreateTime = packet.ReadInt64("CreateTime", indexes);
                 }
-                if (changesMask[18])
+                if (changesMask[17])
                 {
                     data.ArtifactXP = packet.ReadUInt64("ArtifactXP", indexes);
                 }
-                if (changesMask[19])
+                if (changesMask[18])
                 {
                     data.ItemAppearanceModID = packet.ReadByte("ItemAppearanceModID", indexes);
                 }
-                if (changesMask[21])
+                if (changesMask[20])
                 {
                     data.DynamicFlags2 = packet.ReadUInt32("ZoneFlags", indexes);
                 }
-                if (changesMask[22])
+                if (changesMask[21])
                 {
                     Substructures.ItemHandler.ReadItemBonusKey(packet, indexes, "ItemBonusKey");
                 }
-                if (changesMask[23])
+                if (changesMask[22])
                 {
                     data.DEBUGItemLevel = packet.ReadUInt16("DEBUGItemLevel", indexes);
                 }
-                if (changesMask[20])
+                if (changesMask[19])
                 {
-                    data.Modifiers = ReadUpdateItemModList(packet, data.Modifiers as ItemModList, indexes, "Modifiers");
+                    data.Modifiers = ReadUpdateItemModList(packet, indexes, "Modifiers");
                 }
             }
-            if (changesMask[24])
+            if (changesMask[23])
             {
                 for (var i = 0; i < 5; ++i)
                 {
-                    if (changesMask[25 + i])
+                    if (changesMask[24 + i])
                     {
                         data.SpellCharges[i] = packet.ReadInt32("SpellCharges", indexes, i);
                     }
                 }
             }
-            if (changesMask[30])
+            if (changesMask[29])
             {
                 for (var i = 0; i < 13; ++i)
                 {
-                    if (changesMask[31 + i])
+                    if (changesMask[30 + i])
                     {
-                        data.Enchantment[i] = ReadUpdateItemEnchantment(packet, data.Enchantment[i] as ItemEnchantment, indexes, "Enchantment", i);
+                        data.Enchantment[i] = ReadUpdateItemEnchantment(packet, indexes, "Enchantment", i);
                     }
                 }
             }
diff --git a/WowPacketParserModule.V3_4_0_45166/Parsers/UpdateFieldsHandler342.cs b/WowPacketParserModule.V3_4_0_45166/Parsers/UpdateFieldsHandler342.cs
@@ -279,6 +279,7 @@ public override IItemData ReadCreateItemData(Packet packet, UpdateFieldFlag flag
         public override IItemData ReadUpdateItemData(Packet packet, params object[] indexes)
         {
             var data = new ItemData();
+            packet.ResetBitReader();
             var rawChangesMask = new int[2];
             var rawMaskMask = new int[1];
             rawMaskMask[0] = (int)packet.ReadBits(2);
@@ -291,147 +292,135 @@ public override IItemData ReadUpdateItemData(Packet packet, params object[] inde
             if (changesMask[0])
             {
                 if (changesMask[1])
-                {
-                    data.BonusListIDs = Enumerable.Range(0, (int)packet.ReadBits(32)).Select(x => new int()).Cast<System.Nullable<int>>().ToArray();
-                    for (var i = 0; i < data.BonusListIDs.Length; ++i)
-                    {
-                        data.BonusListIDs[i] = packet.ReadInt32("BonusListIDs", indexes, i);
-                    }
-                }
-            }
-            packet.ResetBitReader();
-            if (changesMask[0])
-            {
-                if (changesMask[2])
                 {
                     data.ArtifactPowers.ReadUpdateMask(packet);
                 }
-                if (changesMask[3])
+                if (changesMask[2])
                 {
                     data.Gems.ReadUpdateMask(packet);
                 }
             }
             packet.ResetBitReader();
             if (changesMask[0])
             {
-                if (changesMask[2])
+                if (changesMask[1])
                 {
                     for (var i = 0; i < data.ArtifactPowers.Count; ++i)
                     {
                         if (data.ArtifactPowers.UpdateMask[i])
                         {
-                            data.ArtifactPowers[i] = ReadUpdateArtifactPower(packet, data.ArtifactPowers[i] as ArtifactPower, indexes, "ArtifactPowers", i);
+                            data.ArtifactPowers[i] = ReadUpdateArtifactPower(packet, indexes, "ArtifactPowers", i);
                         }
                     }
                 }
-                if (changesMask[3])
+                if (changesMask[2])
                 {
                     for (var i = 0; i < data.Gems.Count; ++i)
                     {
                         if (data.Gems.UpdateMask[i])
                         {
-                            data.Gems[i] = ReadUpdateSocketedGem(packet, data.Gems[i] as SocketedGem, indexes, "Gems", i);
+                            data.Gems[i] = ReadUpdateSocketedGem(packet, indexes, "Gems", i);
                         }
                     }
                 }
-                if (changesMask[4])
+                if (changesMask[3])
                 {
                     data.Owner = packet.ReadPackedGuid128("Owner", indexes);
                 }
-                if (changesMask[5])
+                if (changesMask[4])
                 {
                     data.ContainedIn = packet.ReadPackedGuid128("ContainedIn", indexes);
                 }
-                if (changesMask[6])
+                if (changesMask[5])
                 {
                     data.Creator = packet.ReadPackedGuid128("Creator", indexes);
                 }
-                if (changesMask[7])
+                if (changesMask[6])
                 {
                     data.GiftCreator = packet.ReadPackedGuid128("GiftCreator", indexes);
                 }
-                if (changesMask[8])
+                if (changesMask[7])
                 {
                     data.StackCount = packet.ReadUInt32("StackCount", indexes);
                 }
-                if (changesMask[9])
+                if (changesMask[8])
                 {
                     data.Expiration = packet.ReadUInt32("Expiration", indexes);
                 }
-                if (changesMask[10])
+                if (changesMask[9])
                 {
                     data.DynamicFlags = packet.ReadUInt32("DynamicFlags", indexes);
                 }
-                if (changesMask[11])
+                if (changesMask[10])
                 {
                     data.PropertySeed = packet.ReadInt32("PropertySeed", indexes);
                 }
-                if (changesMask[12])
+                if (changesMask[11])
                 {
                     data.RandomPropertiesID = packet.ReadInt32("RandomPropertiesID", indexes);
                 }
-                if (changesMask[13])
+                if (changesMask[12])
                 {
                     data.Durability = packet.ReadUInt32("Durability", indexes);
                 }
-                if (changesMask[14])
+                if (changesMask[13])
                 {
                     data.MaxDurability = packet.ReadUInt32("MaxDurability", indexes);
                 }
-                if (changesMask[15])
+                if (changesMask[14])
                 {
                     data.CreatePlayedTime = packet.ReadUInt32("CreatePlayedTime", indexes);
                 }
-                if (changesMask[16])
+                if (changesMask[15])
                 {
                     data.Context = packet.ReadInt32("Context", indexes);
                 }
-                if (changesMask[17])
+                if (changesMask[16])
                 {
                     data.CreateTime = packet.ReadInt64("CreateTime", indexes);
                 }
-                if (changesMask[18])
+                if (changesMask[17])
                 {
                     data.ArtifactXP = packet.ReadUInt64("ArtifactXP", indexes);
                 }
-                if (changesMask[19])
+                if (changesMask[18])
                 {
                     data.ItemAppearanceModID = packet.ReadByte("ItemAppearanceModID", indexes);
                 }
-                if (changesMask[21])
+                if (changesMask[20])
                 {
                     data.DynamicFlags2 = packet.ReadUInt32("ZoneFlags", indexes);
                 }
-                if (changesMask[22])
+                if (changesMask[21])
                 {
                     Substructures.ItemHandler.ReadItemBonusKey(packet, indexes, "ItemBonusKey");
                 }
-                if (changesMask[23])
+                if (changesMask[22])
                 {
                     data.DEBUGItemLevel = packet.ReadUInt16("DEBUGItemLevel", indexes);
                 }
-                if (changesMask[20])
+                if (changesMask[19])
                 {
-                    data.Modifiers = ReadUpdateItemModList(packet, data.Modifiers as ItemModList, indexes, "Modifiers");
+                    data.Modifiers = ReadUpdateItemModList(packet, indexes, "Modifiers");
                 }
             }
-            if (changesMask[24])
+            if (changesMask[23])
             {
                 for (var i = 0; i < 5; ++i)
                 {
-                    if (changesMask[25 + i])
+                    if (changesMask[24 + i])
                     {
                         data.SpellCharges[i] = packet.ReadInt32("SpellCharges", indexes, i);
                     }
                 }
             }
-            if (changesMask[30])
+            if (changesMask[29])
             {
                 for (var i = 0; i < 13; ++i)
                 {
-                    if (changesMask[31 + i])
+                    if (changesMask[30 + i])
                     {
-                        data.Enchantment[i] = ReadUpdateItemEnchantment(packet, data.Enchantment[i] as ItemEnchantment, indexes, "Enchantment", i);
+                        data.Enchantment[i] = ReadUpdateItemEnchantment(packet, indexes, "Enchantment", i);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,7 @@ public override IItemData ReadCreateItemData(Packet packet, UpdateFieldFlag flag`
`279`	`279`	`public override IItemData ReadUpdateItemData(Packet packet, params object[] indexes)`
`280`	`280`	`{`
`281`	`281`	`var data = new ItemData();`
	`282`	`+ packet.ResetBitReader();`
`282`	`283`	`var rawChangesMask = new int[2];`
`283`	`284`	`var rawMaskMask = new int[1];`
`284`	`285`	`rawMaskMask[0] = (int)packet.ReadBits(2);`
`@@ -291,147 +292,135 @@ public override IItemData ReadUpdateItemData(Packet packet, params object[] inde`
`291`	`292`	`if (changesMask[0])`
`292`	`293`	`{`
`293`	`294`	`if (changesMask[1])`
`294`		`- {`
`295`		`- data.BonusListIDs = Enumerable.Range(0, (int)packet.ReadBits(32)).Select(x => new int()).Cast<System.Nullable<int>>().ToArray();`
`296`		`- for (var i = 0; i < data.BonusListIDs.Length; ++i)`
`297`		`- {`
`298`		`- data.BonusListIDs[i] = packet.ReadInt32("BonusListIDs", indexes, i);`
`299`		`- }`
`300`		`- }`
`301`		`- }`
`302`		`- packet.ResetBitReader();`
`303`		`- if (changesMask[0])`
`304`		`- {`
`305`		`- if (changesMask[2])`
`306`	`295`	`{`
`307`	`296`	`data.ArtifactPowers.ReadUpdateMask(packet);`
`308`	`297`	`}`
`309`		`- if (changesMask[3])`
	`298`	`+ if (changesMask[2])`
`310`	`299`	`{`
`311`	`300`	`data.Gems.ReadUpdateMask(packet);`
`312`	`301`	`}`
`313`	`302`	`}`
`314`	`303`	`packet.ResetBitReader();`
`315`	`304`	`if (changesMask[0])`
`316`	`305`	`{`
`317`		`- if (changesMask[2])`
	`306`	`+ if (changesMask[1])`
`318`	`307`	`{`
`319`	`308`	`for (var i = 0; i < data.ArtifactPowers.Count; ++i)`
`320`	`309`	`{`
`321`	`310`	`if (data.ArtifactPowers.UpdateMask[i])`
`322`	`311`	`{`
`323`		`- data.ArtifactPowers[i] = ReadUpdateArtifactPower(packet, data.ArtifactPowers[i] as ArtifactPower, indexes, "ArtifactPowers", i);`
	`312`	`+ data.ArtifactPowers[i] = ReadUpdateArtifactPower(packet, indexes, "ArtifactPowers", i);`
`324`	`313`	`}`
`325`	`314`	`}`
`326`	`315`	`}`
`327`		`- if (changesMask[3])`
	`316`	`+ if (changesMask[2])`
`328`	`317`	`{`
`329`	`318`	`for (var i = 0; i < data.Gems.Count; ++i)`
`330`	`319`	`{`
`331`	`320`	`if (data.Gems.UpdateMask[i])`
`332`	`321`	`{`
`333`		`- data.Gems[i] = ReadUpdateSocketedGem(packet, data.Gems[i] as SocketedGem, indexes, "Gems", i);`
	`322`	`+ data.Gems[i] = ReadUpdateSocketedGem(packet, indexes, "Gems", i);`
`334`	`323`	`}`
`335`	`324`	`}`
`336`	`325`	`}`
`337`		`- if (changesMask[4])`
	`326`	`+ if (changesMask[3])`
`338`	`327`	`{`
`339`	`328`	`data.Owner = packet.ReadPackedGuid128("Owner", indexes);`
`340`	`329`	`}`
`341`		`- if (changesMask[5])`
	`330`	`+ if (changesMask[4])`
`342`	`331`	`{`
`343`	`332`	`data.ContainedIn = packet.ReadPackedGuid128("ContainedIn", indexes);`
`344`	`333`	`}`
`345`		`- if (changesMask[6])`
	`334`	`+ if (changesMask[5])`
`346`	`335`	`{`
`347`	`336`	`data.Creator = packet.ReadPackedGuid128("Creator", indexes);`
`348`	`337`	`}`
`349`		`- if (changesMask[7])`
	`338`	`+ if (changesMask[6])`
`350`	`339`	`{`
`351`	`340`	`data.GiftCreator = packet.ReadPackedGuid128("GiftCreator", indexes);`
`352`	`341`	`}`
`353`		`- if (changesMask[8])`
	`342`	`+ if (changesMask[7])`
`354`	`343`	`{`
`355`	`344`	`data.StackCount = packet.ReadUInt32("StackCount", indexes);`
`356`	`345`	`}`
`357`		`- if (changesMask[9])`
	`346`	`+ if (changesMask[8])`
`358`	`347`	`{`
`359`	`348`	`data.Expiration = packet.ReadUInt32("Expiration", indexes);`
`360`	`349`	`}`
`361`		`- if (changesMask[10])`
	`350`	`+ if (changesMask[9])`
`362`	`351`	`{`
`363`	`352`	`data.DynamicFlags = packet.ReadUInt32("DynamicFlags", indexes);`
`364`	`353`	`}`
`365`		`- if (changesMask[11])`
	`354`	`+ if (changesMask[10])`
`366`	`355`	`{`
`367`	`356`	`data.PropertySeed = packet.ReadInt32("PropertySeed", indexes);`
`368`	`357`	`}`
`369`		`- if (changesMask[12])`
	`358`	`+ if (changesMask[11])`
`370`	`359`	`{`
`371`	`360`	`data.RandomPropertiesID = packet.ReadInt32("RandomPropertiesID", indexes);`
`372`	`361`	`}`
`373`		`- if (changesMask[13])`
	`362`	`+ if (changesMask[12])`
`374`	`363`	`{`
`375`	`364`	`data.Durability = packet.ReadUInt32("Durability", indexes);`
`376`	`365`	`}`
`377`		`- if (changesMask[14])`
	`366`	`+ if (changesMask[13])`
`378`	`367`	`{`
`379`	`368`	`data.MaxDurability = packet.ReadUInt32("MaxDurability", indexes);`
`380`	`369`	`}`
`381`		`- if (changesMask[15])`
	`370`	`+ if (changesMask[14])`
`382`	`371`	`{`
`383`	`372`	`data.CreatePlayedTime = packet.ReadUInt32("CreatePlayedTime", indexes);`
`384`	`373`	`}`
`385`		`- if (changesMask[16])`
	`374`	`+ if (changesMask[15])`
`386`	`375`	`{`
`387`	`376`	`data.Context = packet.ReadInt32("Context", indexes);`
`388`	`377`	`}`
`389`		`- if (changesMask[17])`
	`378`	`+ if (changesMask[16])`
`390`	`379`	`{`
`391`	`380`	`data.CreateTime = packet.ReadInt64("CreateTime", indexes);`
`392`	`381`	`}`
`393`		`- if (changesMask[18])`
	`382`	`+ if (changesMask[17])`
`394`	`383`	`{`
`395`	`384`	`data.ArtifactXP = packet.ReadUInt64("ArtifactXP", indexes);`
`396`	`385`	`}`
`397`		`- if (changesMask[19])`
	`386`	`+ if (changesMask[18])`
`398`	`387`	`{`
`399`	`388`	`data.ItemAppearanceModID = packet.ReadByte("ItemAppearanceModID", indexes);`
`400`	`389`	`}`
`401`		`- if (changesMask[21])`
	`390`	`+ if (changesMask[20])`
`402`	`391`	`{`
`403`	`392`	`data.DynamicFlags2 = packet.ReadUInt32("ZoneFlags", indexes);`
`404`	`393`	`}`
`405`		`- if (changesMask[22])`
	`394`	`+ if (changesMask[21])`
`406`	`395`	`{`
`407`	`396`	`Substructures.ItemHandler.ReadItemBonusKey(packet, indexes, "ItemBonusKey");`
`408`	`397`	`}`
`409`		`- if (changesMask[23])`
	`398`	`+ if (changesMask[22])`
`410`	`399`	`{`
`411`	`400`	`data.DEBUGItemLevel = packet.ReadUInt16("DEBUGItemLevel", indexes);`
`412`	`401`	`}`
`413`		`- if (changesMask[20])`
	`402`	`+ if (changesMask[19])`
`414`	`403`	`{`
`415`		`- data.Modifiers = ReadUpdateItemModList(packet, data.Modifiers as ItemModList, indexes, "Modifiers");`
	`404`	`+ data.Modifiers = ReadUpdateItemModList(packet, indexes, "Modifiers");`
`416`	`405`	`}`
`417`	`406`	`}`
`418`		`- if (changesMask[24])`
	`407`	`+ if (changesMask[23])`
`419`	`408`	`{`
`420`	`409`	`for (var i = 0; i < 5; ++i)`
`421`	`410`	`{`
`422`		`- if (changesMask[25 + i])`
	`411`	`+ if (changesMask[24 + i])`
`423`	`412`	`{`
`424`	`413`	`data.SpellCharges[i] = packet.ReadInt32("SpellCharges", indexes, i);`
`425`	`414`	`}`
`426`	`415`	`}`
`427`	`416`	`}`
`428`		`- if (changesMask[30])`
	`417`	`+ if (changesMask[29])`
`429`	`418`	`{`
`430`	`419`	`for (var i = 0; i < 13; ++i)`
`431`	`420`	`{`
`432`		`- if (changesMask[31 + i])`
	`421`	`+ if (changesMask[30 + i])`
`433`	`422`	`{`
`434`		`- data.Enchantment[i] = ReadUpdateItemEnchantment(packet, data.Enchantment[i] as ItemEnchantment, indexes, "Enchantment", i);`
	`423`	`+ data.Enchantment[i] = ReadUpdateItemEnchantment(packet, indexes, "Enchantment", i);`
`435`	`424`	`}`
`436`	`425`	`}`
`437`	`426`	`}`