Skip to content

fix TrainerType parsing for 11.2.5.63704 #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

fix TrainerType parsing for 11.2.5.63704 #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3504ca9
fix TrainerType parsing for 11.2.5.63704
Alica228 Oct 31, 2025
3282a4c
added mop classic client builds
Alica228 Oct 31, 2025
2a233ce
Merge remote-tracking branch 'upstream/master'
Alica228 Nov 7, 2025
f809046
11.2.5.64270
Alica228 Nov 7, 2025
7f072da
Merge branch 'TrinityCore:master' into master
Alica228 Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions WowPacketParser/Enums/ClientVersionBuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,17 @@ public enum ClientVersionBuild
V5_5_0_62422 = 62422, // both live and ptr
V5_5_0_62518 = 62518, // live
V5_5_0_62655 = 62655, // live
V5_5_0_62959 = 62959, // both live and ptr

V5_5_1_63311 = 63311, // both live and ptr
V5_5_1_63364 = 63364, // both live and ptr
V5_5_1_63393 = 63393, // both live and ptr
V5_5_1_63421 = 63421, // both live and ptr
V5_5_1_63449 = 63449, // both live and ptr
V5_5_1_63538 = 63538, // both live and ptr

V5_5_2_64068 = 64068, // both live and ptr
V5_5_2_64133 = 64133, // both live and ptr

// Battle.net - should probably not mix this but oh well
BattleNetV37165 = 37165,
Expand Down
11 changes: 11 additions & 0 deletions WowPacketParser/Enums/Version/Opcodes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,18 @@ public static ClientVersionBuild GetOpcodeDefiningBuild(ClientVersionBuild build
case ClientVersionBuild.V5_5_0_62422:
case ClientVersionBuild.V5_5_0_62518:
case ClientVersionBuild.V5_5_0_62655:
case ClientVersionBuild.V5_5_0_62959:
return ClientVersionBuild.V5_5_0_61735;
case ClientVersionBuild.V5_5_1_63311:
case ClientVersionBuild.V5_5_1_63364:
case ClientVersionBuild.V5_5_1_63393:
case ClientVersionBuild.V5_5_1_63421:
case ClientVersionBuild.V5_5_1_63449:
case ClientVersionBuild.V5_5_1_63538:
return ClientVersionBuild.V5_5_1_63311;
case ClientVersionBuild.V5_5_2_64068:
case ClientVersionBuild.V5_5_2_64133:
return ClientVersionBuild.V5_5_2_64068;
default:
return ClientVersionBuild.V3_3_5a_12340;
}
Expand Down
19 changes: 17 additions & 2 deletions WowPacketParser/Enums/Version/UpdateFields.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1402,9 +1402,24 @@ private static string GetUpdateFieldDictionaryBuildName(ClientVersionBuild build
case ClientVersionBuild.V5_5_0_62422:
case ClientVersionBuild.V5_5_0_62518:
case ClientVersionBuild.V5_5_0_62655:
{
case ClientVersionBuild.V5_5_0_62959:
{
return "V5_5_0_61735";
}
}
case ClientVersionBuild.V5_5_1_63311:
case ClientVersionBuild.V5_5_1_63364:
case ClientVersionBuild.V5_5_1_63393:
case ClientVersionBuild.V5_5_1_63421:
case ClientVersionBuild.V5_5_1_63449:
case ClientVersionBuild.V5_5_1_63538:
{
return "V5_5_0_61735"; // tmp
}
case ClientVersionBuild.V5_5_2_64068:
case ClientVersionBuild.V5_5_2_64133:
{
return "V5_5_0_61735"; // tmp
}
default:
{
return "V3_3_5a_12340";
Expand Down
18 changes: 18 additions & 0 deletions WowPacketParser/Misc/ClientVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1603,9 +1603,18 @@ public static ClientVersionBuild GetVersionDefiningBuild(ClientVersionBuild buil
case ClientVersionBuild.V5_5_0_62422:
case ClientVersionBuild.V5_5_0_62518:
case ClientVersionBuild.V5_5_0_62655:
case ClientVersionBuild.V5_5_0_62959:
case ClientVersionBuild.V5_5_1_63311:
case ClientVersionBuild.V5_5_1_63364:
case ClientVersionBuild.V5_5_1_63393:
case ClientVersionBuild.V5_5_1_63421:
case ClientVersionBuild.V5_5_1_63449:
case ClientVersionBuild.V5_5_1_63538:
case ClientVersionBuild.V1_15_8_63829:
case ClientVersionBuild.V1_15_8_64057:
case ClientVersionBuild.V5_5_2_64068:
case ClientVersionBuild.V1_15_8_64130:
case ClientVersionBuild.V5_5_2_64133:
return ClientVersionBuild.V5_5_0_61735;
case ClientVersionBuild.BattleNetV37165:
return ClientVersionBuild.BattleNetV37165;
Expand Down Expand Up @@ -2292,6 +2301,15 @@ public static bool IsMoPClassicClientVersionBuild(ClientVersionBuild build)
case ClientVersionBuild.V5_5_0_62422:
case ClientVersionBuild.V5_5_0_62518:
case ClientVersionBuild.V5_5_0_62655:
case ClientVersionBuild.V5_5_0_62959:
case ClientVersionBuild.V5_5_1_63311:
case ClientVersionBuild.V5_5_1_63364:
case ClientVersionBuild.V5_5_1_63393:
case ClientVersionBuild.V5_5_1_63421:
case ClientVersionBuild.V5_5_1_63449:
case ClientVersionBuild.V5_5_1_63538:
case ClientVersionBuild.V5_5_2_64068:
case ClientVersionBuild.V5_5_2_64133:
return true;
default:
return false;
Expand Down
5 changes: 4 additions & 1 deletion WowPacketParserModule.V6_0_2_19033/Parsers/NpcHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,10 @@ public static void HandleServerTrainerList(Packet packet)
}
}

trainer.Type = packet.ReadInt32E<TrainerType>("TrainerType");
if (ClientVersion.AddedInVersion(ClientVersionBuild.V11_2_5_63704))
trainer.Type = packet.ReadByteE<TrainerType>("TrainerType");
else
trainer.Type = packet.ReadInt32E<TrainerType>("TrainerType");
trainer.Id = packet.ReadUInt32("TrainerID");

var count = packet.ReadUInt32("Spells");
Expand Down