From 9562b4b459ccd58ec1db4a20cae596b69f99e1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Sat, 1 Jan 2022 18:24:36 +0100 Subject: [PATCH] fix: move FamilyName to InPlayerSubPacket --- .../Server/Entities/InPlayerSubPacket.cs | 28 ++++++++++--------- .../Packets/Server/Players/FamilySubPacket.cs | 6 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Core/NosSmooth.Packets/Packets/Server/Entities/InPlayerSubPacket.cs b/Core/NosSmooth.Packets/Packets/Server/Entities/InPlayerSubPacket.cs index f51f850..a6517ee 100644 --- a/Core/NosSmooth.Packets/Packets/Server/Entities/InPlayerSubPacket.cs +++ b/Core/NosSmooth.Packets/Packets/Server/Entities/InPlayerSubPacket.cs @@ -53,32 +53,34 @@ public record InPlayerSubPacket UpgradeRareSubPacket WeaponUpgradeRareSubPacket, [PacketIndex(17)] UpgradeRareSubPacket ArmorUpgradeRareSubPacket, - [PacketIndex(18)] + [PacketIndex(18, InnerSeparator = '.')] FamilySubPacket FamilySubPacket, [PacketIndex(19)] - string ReputationIcon, + string FamilyName, [PacketIndex(20)] - bool IsInvisible, + string ReputationIcon, [PacketIndex(21)] - byte MorphUpgrade, + bool IsInvisible, [PacketIndex(22)] - FactionType Faction, + byte MorphUpgrade, [PacketIndex(23)] - byte MorphUpgrade2, + FactionType Faction, [PacketIndex(24)] - byte Level, + byte MorphUpgrade2, [PacketIndex(25)] + byte Level, + [PacketIndex(26)] byte FamilyLevel, - [PacketListIndex(26, ListSeparator = '|')] + [PacketListIndex(27, ListSeparator = '|')] IReadOnlyList FamilyIcons, - [PacketIndex(27)] - bool ArenaWinner, [PacketIndex(28)] - short Compliment, + bool ArenaWinner, [PacketIndex(29)] - byte Size, + short Compliment, [PacketIndex(30)] - byte HeroLevel, + byte Size, [PacketIndex(31)] + byte HeroLevel, + [PacketIndex(32)] short Title ) : IPacket; \ No newline at end of file diff --git a/Core/NosSmooth.Packets/Packets/Server/Players/FamilySubPacket.cs b/Core/NosSmooth.Packets/Packets/Server/Players/FamilySubPacket.cs index 8dd1996..05ee45d 100644 --- a/Core/NosSmooth.Packets/Packets/Server/Players/FamilySubPacket.cs +++ b/Core/NosSmooth.Packets/Packets/Server/Players/FamilySubPacket.cs @@ -20,8 +20,6 @@ public record FamilySubPacket ( [PacketIndex(0, AfterSeparator = '.')] string FamilyId, - [PacketIndex(1)] - short Title, - [PacketIndex(2)] - string FamilyName + [PacketIndex(1, IsOptional = true)] + short? Title ) : IPacket; \ No newline at end of file -- 2.49.0