From c834013bd3438c87f8616fefc059ae9f2865c0e1 Mon Sep 17 00:00:00 2001 From: js6pak Date: Thu, 7 Apr 2022 16:58:33 +0200 Subject: [PATCH] Simplify Message07JoinedGameS2CPre20220202 --- .../Messages/S2C/Message07JoinedGameS2C.cs | 11 +++--- .../S2C/Message07JoinedGameS2CPre20220202.cs | 36 ------------------- .../Net/State/Game.Outgoing.cs | 11 ++---- 3 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 src/Impostor.Api/Net/Messages/S2C/Message07JoinedGameS2CPre20220202.cs diff --git a/src/Impostor.Api/Net/Messages/S2C/Message07JoinedGameS2C.cs b/src/Impostor.Api/Net/Messages/S2C/Message07JoinedGameS2C.cs index d5d3718..bba0e71 100644 --- a/src/Impostor.Api/Net/Messages/S2C/Message07JoinedGameS2C.cs +++ b/src/Impostor.Api/Net/Messages/S2C/Message07JoinedGameS2C.cs @@ -4,7 +4,7 @@ namespace Impostor.Api.Net.Messages.S2C { public static class Message07JoinedGameS2C { - public static void Serialize(IMessageWriter writer, bool clear, int gameCode, int playerId, int hostId, IClientPlayer[] otherPlayers) + public static void Serialize(IMessageWriter writer, bool clear, int gameCode, int playerId, int hostId, IClientPlayer[] otherPlayers, bool post20220202 = true) { if (clear) { @@ -24,9 +24,12 @@ namespace Impostor.Api.Net.Messages.S2C ply.Client.PlatformSpecificData.Serialize(writer); writer.WritePacked(ply.Character?.PlayerInfo.PlayerLevel ?? 1); - // ProductUserId and FriendCode are not yet known, so set them to an empty string - writer.Write(string.Empty); - writer.Write(string.Empty); + if (post20220202) + { + // ProductUserId and FriendCode are not yet known, so set them to an empty string + writer.Write(string.Empty); + writer.Write(string.Empty); + } } writer.EndMessage(); diff --git a/src/Impostor.Api/Net/Messages/S2C/Message07JoinedGameS2CPre20220202.cs b/src/Impostor.Api/Net/Messages/S2C/Message07JoinedGameS2CPre20220202.cs deleted file mode 100644 index 65faac4..0000000 --- a/src/Impostor.Api/Net/Messages/S2C/Message07JoinedGameS2CPre20220202.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; - -namespace Impostor.Api.Net.Messages.S2C -{ - public static class Message07JoinedGameS2CPre20220202 - { - public static void Serialize(IMessageWriter writer, bool clear, int gameCode, int playerId, int hostId, IClientPlayer[] otherPlayers) - { - if (clear) - { - writer.Clear(MessageType.Reliable); - } - - writer.StartMessage(MessageFlags.JoinedGame); - writer.Write(gameCode); - writer.Write(playerId); - writer.Write(hostId); - writer.WritePacked(otherPlayers.Length); - - foreach (var ply in otherPlayers) - { - writer.WritePacked(ply.Client.Id); - writer.Write(ply.Client.Name); - ply.Client.PlatformSpecificData.Serialize(writer); - writer.WritePacked(ply.Character?.PlayerInfo.PlayerLevel ?? 1); - } - - writer.EndMessage(); - } - - public static void Deserialize(IMessageReader reader) - { - throw new NotImplementedException(); - } - } -} diff --git a/src/Impostor.Server/Net/State/Game.Outgoing.cs b/src/Impostor.Server/Net/State/Game.Outgoing.cs index b7c808b..c03319d 100644 --- a/src/Impostor.Server/Net/State/Game.Outgoing.cs +++ b/src/Impostor.Server/Net/State/Game.Outgoing.cs @@ -83,15 +83,8 @@ namespace Impostor.Server.Net.State .Select(x => x.Value) .ToArray(); - // TODO: clean up Pre20220202 when versions before it are no longer supported. - if (player.Client.GameVersion >= GameVersion.GetVersion(2022, 2, 2)) - { - Message07JoinedGameS2C.Serialize(message, clear, Code, player.Client.Id, HostId, players); - } - else - { - Message07JoinedGameS2CPre20220202.Serialize(message, clear, Code, player.Client.Id, HostId, players); - } + // TODO: clean up post20220202 when versions before it are no longer supported. + Message07JoinedGameS2C.Serialize(message, clear, Code, player.Client.Id, HostId, players, player.Client.GameVersion >= GameVersion.GetVersion(2022, 2, 2)); } private void WriteAlterGameMessage(IMessageWriter message, bool clear, bool isPublic) -- 2.39.5