Skip to content

Commit bbe9f2b

Browse files
PowerpuffIOPowerpuffIO
authored
Merge branch 'TrinityCore:master' into master
2 parents 4cd3674 + dc62a7c commit bbe9f2b

5 files changed

Lines changed: 49 additions & 2 deletions

File tree

‎WowPacketParser/Enums/ClientVersionBuild.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,8 @@ public enum ClientVersionBuild
703703
V12_0_7_68235 = 68235,
704704
V12_0_7_68256 = 68256,
705705
V12_0_7_68275 = 68275,
706+
V12_0_7_68367 = 68367,
707+
V12_0_7_68453 = 68453,
706708

707709
// Classic
708710
V1_13_2_31446 = 31446,
@@ -1104,12 +1106,19 @@ public enum ClientVersionBuild
11041106

11051107
V5_5_3_64802 = 64802, // both live and ptr
11061108
V5_5_3_64857 = 64857, // live
1109+
V5_5_3_65302 = 65302, // live //
11071110
V5_5_3_65703 = 65703, // live
11081111
V5_5_3_65746 = 65746, // live
11091112
V5_5_3_65890 = 65890, // live
11101113
V5_5_3_65988 = 65988, // live
11111114
V5_5_3_66128 = 66128, // live
11121115
V5_5_3_66290 = 66290, // live
1116+
V5_5_3_66382 = 66382, // ptr
1117+
V5_5_3_66509 = 66509, // live
1118+
V5_5_3_66565 = 66565, // live
1119+
V5_5_3_66839 = 66839, // live
1120+
V5_5_3_67158 = 67158, // live
1121+
V5_5_3_67509 = 67509, // live
11131122
// Battle.net - should probably not mix this but oh well
11141123
BattleNetV37165 = 37165,
11151124

‎WowPacketParser/Enums/Version/Opcodes.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -892,6 +892,8 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
892892
case ClientVersionBuild.V12_0_7_68235:
893893
case ClientVersionBuild.V12_0_7_68256:
894894
case ClientVersionBuild.V12_0_7_68275:
895+
case ClientVersionBuild.V12_0_7_68367:
896+
case ClientVersionBuild.V12_0_7_68453:
895897
return ClientVersionBuild.V12_0_7_67808;
896898
case ClientVersionBuild.V1_13_2_31446:
897899
case ClientVersionBuild.V1_13_2_31650:
@@ -1264,12 +1266,19 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
12641266
return ClientVersionBuild.V5_5_2_64068;
12651267
case ClientVersionBuild.V5_5_3_64802:
12661268
case ClientVersionBuild.V5_5_3_64857:
1269+
case ClientVersionBuild.V5_5_3_65302:
12671270
case ClientVersionBuild.V5_5_3_65703:
12681271
case ClientVersionBuild.V5_5_3_65746:
12691272
case ClientVersionBuild.V5_5_3_65890:
12701273
case ClientVersionBuild.V5_5_3_65988:
12711274
case ClientVersionBuild.V5_5_3_66128:
12721275
case ClientVersionBuild.V5_5_3_66290:
1276+
case ClientVersionBuild.V5_5_3_66382:
1277+
case ClientVersionBuild.V5_5_3_66509:
1278+
case ClientVersionBuild.V5_5_3_66565:
1279+
case ClientVersionBuild.V5_5_3_66839:
1280+
case ClientVersionBuild.V5_5_3_67158:
1281+
case ClientVersionBuild.V5_5_3_67509:
12731282
return ClientVersionBuild.V5_5_3_64802;
12741283
case ClientVersionBuild.V2_5_5_64796:
12751284
case ClientVersionBuild.V2_5_5_64912:

‎WowPacketParser/Enums/Version/UpdateFields.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1064,6 +1064,8 @@ private static ClientVersionBuild GetUpdateFieldDictionaryBuild(ClientVersionBui
10641064
case ClientVersionBuild.V12_0_7_68235:
10651065
case ClientVersionBuild.V12_0_7_68256:
10661066
case ClientVersionBuild.V12_0_7_68275:
1067+
case ClientVersionBuild.V12_0_7_68367:
1068+
case ClientVersionBuild.V12_0_7_68453:
10671069
{
10681070
return ClientVersionBuild.V12_0_7_67808;
10691071
}
@@ -1519,13 +1521,20 @@ private static ClientVersionBuild GetUpdateFieldDictionaryBuild(ClientVersionBui
15191521
}
15201522
case ClientVersionBuild.V5_5_3_64802:
15211523
case ClientVersionBuild.V5_5_3_64857:
1524+
case ClientVersionBuild.V5_5_3_65302:
15221525
case ClientVersionBuild.V5_5_3_65703:
15231526
case ClientVersionBuild.V5_5_3_65746:
15241527
case ClientVersionBuild.V5_5_3_65890:
15251528
case ClientVersionBuild.V5_5_3_65988:
15261529
case ClientVersionBuild.V5_5_3_66128:
15271530
case ClientVersionBuild.V5_5_3_66290:
1528-
{
1531+
case ClientVersionBuild.V5_5_3_66382:
1532+
case ClientVersionBuild.V5_5_3_66509:
1533+
case ClientVersionBuild.V5_5_3_66565:
1534+
case ClientVersionBuild.V5_5_3_66839:
1535+
case ClientVersionBuild.V5_5_3_67158:
1536+
case ClientVersionBuild.V5_5_3_67509:
1537+
{
15291538
return ClientVersionBuild.V5_5_3_64802;
15301539
}
15311540
default:

‎WowPacketParser/Misc/ClientVersion.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,7 @@ public static class ClientVersion
704704
new KeyValuePair<ClientVersionBuild, DateTime>(ClientVersionBuild.V12_0_7_68235, new DateTime(2026, 06, 17, 03, 39, 00)),
705705
new KeyValuePair<ClientVersionBuild, DateTime>(ClientVersionBuild.V12_0_7_68256, new DateTime(2026, 06, 18)),
706706
new KeyValuePair<ClientVersionBuild, DateTime>(ClientVersionBuild.V12_0_7_68275, new DateTime(2026, 06, 24)),
707+
new KeyValuePair<ClientVersionBuild, DateTime>(ClientVersionBuild.V12_0_7_68453, new DateTime(2026, 07, 07)),
707708

708709
// no classic info, pkt contain build in header
709710
};
@@ -1397,6 +1398,8 @@ public static ClientVersionBuild GetVersionDefiningBuild(ClientVersionBuild buil
13971398
case ClientVersionBuild.V12_0_7_68235:
13981399
case ClientVersionBuild.V12_0_7_68256:
13991400
case ClientVersionBuild.V12_0_7_68275:
1401+
case ClientVersionBuild.V12_0_7_68367:
1402+
case ClientVersionBuild.V12_0_7_68453:
14001403
return ClientVersionBuild.V12_0_0_65390;
14011404
//Classic
14021405
case ClientVersionBuild.V1_13_2_31446:
@@ -1737,11 +1740,18 @@ public static ClientVersionBuild GetVersionDefiningBuild(ClientVersionBuild buil
17371740
case ClientVersionBuild.V5_5_2_64481:
17381741
case ClientVersionBuild.V5_5_3_64802:
17391742
case ClientVersionBuild.V5_5_3_64857:
1743+
case ClientVersionBuild.V5_5_3_65302:
17401744
case ClientVersionBuild.V5_5_3_65746:
17411745
case ClientVersionBuild.V5_5_3_65890:
17421746
case ClientVersionBuild.V5_5_3_65988:
17431747
case ClientVersionBuild.V5_5_3_66128:
17441748
case ClientVersionBuild.V5_5_3_66290:
1749+
case ClientVersionBuild.V5_5_3_66382:
1750+
case ClientVersionBuild.V5_5_3_66509:
1751+
case ClientVersionBuild.V5_5_3_66565:
1752+
case ClientVersionBuild.V5_5_3_66839:
1753+
case ClientVersionBuild.V5_5_3_67158:
1754+
case ClientVersionBuild.V5_5_3_67509:
17451755
case ClientVersionBuild.V1_15_8_63829:
17461756
case ClientVersionBuild.V1_15_8_64057:
17471757
case ClientVersionBuild.V1_15_8_64130:
@@ -2484,11 +2494,18 @@ public static bool IsMoPClassicClientVersionBuild(ClientVersionBuild build)
24842494
case ClientVersionBuild.V5_5_2_64481:
24852495
case ClientVersionBuild.V5_5_3_64802:
24862496
case ClientVersionBuild.V5_5_3_64857:
2497+
case ClientVersionBuild.V5_5_3_65302:
24872498
case ClientVersionBuild.V5_5_3_65746:
24882499
case ClientVersionBuild.V5_5_3_65890:
24892500
case ClientVersionBuild.V5_5_3_65988:
24902501
case ClientVersionBuild.V5_5_3_66128:
24912502
case ClientVersionBuild.V5_5_3_66290:
2503+
case ClientVersionBuild.V5_5_3_66382:
2504+
case ClientVersionBuild.V5_5_3_66509:
2505+
case ClientVersionBuild.V5_5_3_66565:
2506+
case ClientVersionBuild.V5_5_3_66839:
2507+
case ClientVersionBuild.V5_5_3_67158:
2508+
case ClientVersionBuild.V5_5_3_67509:
24922509
return true;
24932510
default:
24942511
return false;

‎WowPacketParserModule.V8_0_1_27101/Parsers/MiscellaneousHandler.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,10 @@ public static void HandleMultiplePackets(Packet packet)
260260
byte[] bytes = null;
261261

262262
len = packet.ReadUInt16();
263-
opcode = packet.ReadUInt16();
263+
if (ClientVersion.AddedInVersion(ClientVersionBuild.V11_0_5_57171))
264+
opcode = packet.ReadInt32();
265+
else
266+
opcode = packet.ReadUInt16();
264267
bytes = packet.ReadBytes(len);
265268

266269
if (bytes == null || len == 0)

0 commit comments

Comments
 (0)