Merge branch 'TrinityCore:master' into master

PowerpuffIO · web-flow · commit abca1e52fdf6 · 2026-04-29T20:22:52.000+03:00
diff --git a/WowPacketParser/Enums/ClientVersionBuild.cs b/WowPacketParser/Enums/ClientVersionBuild.cs
@@ -690,6 +690,7 @@ public enum ClientVersionBuild
         V12_0_5_67114 = 67114,
         V12_0_5_67165 = 67165, // CN only
         V12_0_5_67186 = 67186,
+        V12_0_5_67235 = 67235,
 
         // Classic
         V1_13_2_31446 = 31446,
diff --git a/WowPacketParser/Enums/Version/Opcodes.cs b/WowPacketParser/Enums/Version/Opcodes.cs
@@ -877,6 +877,7 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
                 case ClientVersionBuild.V12_0_5_67114:
                 case ClientVersionBuild.V12_0_5_67165:
                 case ClientVersionBuild.V12_0_5_67186:
+                case ClientVersionBuild.V12_0_5_67235:
                     return ClientVersionBuild.V12_0_5_66741;
                 case ClientVersionBuild.V1_13_2_31446:
                 case ClientVersionBuild.V1_13_2_31650:
diff --git a/WowPacketParser/Enums/Version/UpdateFields.cs b/WowPacketParser/Enums/Version/UpdateFields.cs
@@ -1049,6 +1049,7 @@ private static ClientVersionBuild GetUpdateFieldDictionaryBuild(ClientVersionBui
                 case ClientVersionBuild.V12_0_5_67114:
                 case ClientVersionBuild.V12_0_5_67165:
                 case ClientVersionBuild.V12_0_5_67186:
+                case ClientVersionBuild.V12_0_5_67235:
                 {
                     return ClientVersionBuild.V12_0_5_66741;
                 }
diff --git a/WowPacketParser/Misc/ClientVersion.cs b/WowPacketParser/Misc/ClientVersion.cs
@@ -692,6 +692,7 @@ public static class ClientVersion
             new KeyValuePair<ClientVersionBuild, DateTime>(ClientVersionBuild.V12_0_5_67088, new DateTime(2026, 04, 21)),
             new KeyValuePair<ClientVersionBuild, DateTime>(ClientVersionBuild.V12_0_5_67114, new DateTime(2026, 04, 24)),
             new KeyValuePair<ClientVersionBuild, DateTime>(ClientVersionBuild.V12_0_5_67186, new DateTime(2026, 04, 24, 01, 30, 00)),
+            new KeyValuePair<ClientVersionBuild, DateTime>(ClientVersionBuild.V12_0_5_67235, new DateTime(2026, 04, 29)),
 
             // no classic info, pkt contain build in header
         };
@@ -1373,6 +1374,7 @@ public static ClientVersionBuild GetVersionDefiningBuild(ClientVersionBuild buil
                 case ClientVersionBuild.V12_0_5_67114:
                 case ClientVersionBuild.V12_0_5_67165:
                 case ClientVersionBuild.V12_0_5_67186:
+                case ClientVersionBuild.V12_0_5_67235:
                     return ClientVersionBuild.V12_0_0_65390;
                 //Classic
                 case ClientVersionBuild.V1_13_2_31446:
diff --git a/WowPacketParser/Parsing/Parsers/LfgHandler.cs b/WowPacketParser/Parsing/Parsers/LfgHandler.cs
@@ -252,7 +252,7 @@ public static void HandleLfgOfferContinue(Packet packet)
             packet.ReadLfgEntry("LFG Entry");
         }
 
-        public static void ReadDungeonJoinResults(Packet packet, params int[] values)
+        public static void ReadDungeonJoinResults(Packet packet, params object[] values)
         {
             packet.ReadLfgEntry("LFG Entry", values);
             packet.ReadUInt32E<LfgEntryCheckResult>("Entry Check Result", values);
diff --git a/WowPacketParser/Parsing/Parsers/NpcHandler.cs b/WowPacketParser/Parsing/Parsers/NpcHandler.cs
@@ -606,7 +606,7 @@ public static void HandleNpcGossip(Packet packet)
                     BoxCoded = gossipOption.BoxCoded.Value,
                     BoxCost = (uint)gossipOption.BoxMoney.Value,
                     Text = gossipOption.OptionText,
-                    BoxText = gossipOption.BoxText
+                    BoxText = boxText
                 });
 
                 Storage.GossipMenuOptions.Add((gossipOption.MenuID, gossipOption.OptionID), gossipOption, packet.TimeSpan);
diff --git a/WowPacketParserModule.V5_3_0_16981/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_3_0_16981/Parsers/NpcHandler.cs
@@ -121,7 +121,7 @@ public static void HandleNpcGossip(Packet packet)
                     BoxCoded = gossipOption.BoxCoded.Value,
                     BoxCost = (uint)gossipOption.BoxMoney.Value,
                     Text = gossipOption.OptionText,
-                    BoxText = gossipOption.BoxText
+                    BoxText = boxText
                 });
             }
             packet.ReadXORByte(guidBytes, 0);
diff --git a/WowPacketParserModule.V5_4_0_17359/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_0_17359/Parsers/NpcHandler.cs
@@ -153,7 +153,7 @@ public static void HandleNpcGossip(Packet packet)
                     BoxCoded = gossipOption.BoxCoded.Value,
                     BoxCost = (uint)gossipOption.BoxMoney.Value,
                     Text = gossipOption.OptionText,
-                    BoxText = gossipOption.BoxText
+                    BoxText = boxText
                 });
             }
 
diff --git a/WowPacketParserModule.V5_4_1_17538/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_1_17538/Parsers/NpcHandler.cs
@@ -90,7 +90,7 @@ public static void HandleNpcGossip(Packet packet)
                     BoxCoded = gossipOption.BoxCoded.Value,
                     BoxCost = (uint)gossipOption.BoxMoney.Value,
                     Text = gossipOption.OptionText,
-                    BoxText = gossipOption.BoxText
+                    BoxText = boxText
                 });
             }
 
diff --git a/WowPacketParserModule.V5_4_2_17658/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_2_17658/Parsers/NpcHandler.cs
@@ -95,7 +95,7 @@ public static void HandleNpcGossip(Packet packet)
                     BoxCoded = gossipOption.BoxCoded.Value,
                     BoxCost = (uint)gossipOption.BoxMoney.Value,
                     Text = gossipOption.OptionText,
-                    BoxText = gossipOption.BoxText
+                    BoxText = boxText
                 });
             }
 
diff --git a/WowPacketParserModule.V5_4_7_17898/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_7_17898/Parsers/NpcHandler.cs
@@ -146,7 +146,7 @@ public static void HandleNpcGossip(Packet packet)
                     BoxCoded = gossipMenuOption.BoxCoded.Value,
                     BoxCost = (uint)gossipMenuOption.BoxMoney.Value,
                     Text = gossipMenuOption.OptionText,
-                    BoxText = gossipMenuOption.BoxText
+                    BoxText = boxText
                 });
             }
 
diff --git a/WowPacketParserModule.V5_4_8_18291/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_8_18291/Parsers/NpcHandler.cs
@@ -144,7 +144,7 @@ public static void HandleNpcGossip(Packet packet)
                     BoxCoded = gossipMenuOption.BoxCoded.Value,
                     BoxCost = (uint)gossipMenuOption.BoxMoney.Value,
                     Text = gossipMenuOption.OptionText,
-                    BoxText = gossipMenuOption.BoxText
+                    BoxText = boxText
                 });
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1049,6 +1049,7 @@ private static ClientVersionBuild GetUpdateFieldDictionaryBuild(ClientVersionBui`
`1049`	`1049`	`case ClientVersionBuild.V12_0_5_67114:`
`1050`	`1050`	`case ClientVersionBuild.V12_0_5_67165:`
`1051`	`1051`	`case ClientVersionBuild.V12_0_5_67186:`
	`1052`	`+ case ClientVersionBuild.V12_0_5_67235:`
`1052`	`1053`	`{`
`1053`	`1054`	`return ClientVersionBuild.V12_0_5_66741;`
`1054`	`1055`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public static void HandleLfgOfferContinue(Packet packet)`
`252`	`252`	`packet.ReadLfgEntry("LFG Entry");`
`253`	`253`	`}`
`254`	`254`
`255`		`- public static void ReadDungeonJoinResults(Packet packet, params int[] values)`
	`255`	`+ public static void ReadDungeonJoinResults(Packet packet, params object[] values)`
`256`	`256`	`{`
`257`	`257`	`packet.ReadLfgEntry("LFG Entry", values);`
`258`	`258`	`packet.ReadUInt32E<LfgEntryCheckResult>("Entry Check Result", values);`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public static void HandleNpcGossip(Packet packet)`
`121`	`121`	`BoxCoded = gossipOption.BoxCoded.Value,`
`122`	`122`	`BoxCost = (uint)gossipOption.BoxMoney.Value,`
`123`	`123`	`Text = gossipOption.OptionText,`
`124`		`- BoxText = gossipOption.BoxText`
	`124`	`+ BoxText = boxText`
`125`	`125`	`});`
`126`	`126`	`}`
`127`	`127`	`packet.ReadXORByte(guidBytes, 0);`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public static void HandleNpcGossip(Packet packet)`
`153`	`153`	`BoxCoded = gossipOption.BoxCoded.Value,`
`154`	`154`	`BoxCost = (uint)gossipOption.BoxMoney.Value,`
`155`	`155`	`Text = gossipOption.OptionText,`
`156`		`- BoxText = gossipOption.BoxText`
	`156`	`+ BoxText = boxText`
`157`	`157`	`});`
`158`	`158`	`}`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static void HandleNpcGossip(Packet packet)`
`90`	`90`	`BoxCoded = gossipOption.BoxCoded.Value,`
`91`	`91`	`BoxCost = (uint)gossipOption.BoxMoney.Value,`
`92`	`92`	`Text = gossipOption.OptionText,`
`93`		`- BoxText = gossipOption.BoxText`
	`93`	`+ BoxText = boxText`
`94`	`94`	`});`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public static void HandleNpcGossip(Packet packet)`
`95`	`95`	`BoxCoded = gossipOption.BoxCoded.Value,`
`96`	`96`	`BoxCost = (uint)gossipOption.BoxMoney.Value,`
`97`	`97`	`Text = gossipOption.OptionText,`
`98`		`- BoxText = gossipOption.BoxText`
	`98`	`+ BoxText = boxText`
`99`	`99`	`});`
`100`	`100`	`}`
`101`	`101`