From: miniduikboot <mini@duikbo.at>
Date: Sun, 25 Jul 2021 18:22:02 +0000 (+0200)
Subject: Address feedback
X-Git-Tag: v1.6.0^2~2
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=a1dac9f8b71c93e2dfba5df7a0d4e7876ada604e;p=rhonda%2Fimpostor.git

Address feedback
---

diff --git a/src/Impostor.Api/Net/Messages/C2S/HandshakeC2S.cs b/src/Impostor.Api/Net/Messages/C2S/HandshakeC2S.cs
index 62ad375..1a45688 100644
--- a/src/Impostor.Api/Net/Messages/C2S/HandshakeC2S.cs
+++ b/src/Impostor.Api/Net/Messages/C2S/HandshakeC2S.cs
@@ -4,6 +4,8 @@ namespace Impostor.Api.Net.Messages.C2S
 {
     public static class HandshakeC2S
     {
+        private static readonly int ExtendedHandshakeMinVersion = GameVersion.GetVersion(2021, 6, 30);
+
         public static void Deserialize(IMessageReader reader, out int clientVersion, out string name, out uint lastNonceReceived, out Language language, out QuickChatModes chatMode)
         {
             clientVersion = reader.ReadInt32();
@@ -12,7 +14,7 @@ namespace Impostor.Api.Net.Messages.C2S
 
             // Version 2021.6.30 (aka 50537300) is the first version that includes language and chat modes
             // In case the game is older than that, stop reading here.
-            if (clientVersion >= 50537300)
+            if (clientVersion >= ExtendedHandshakeMinVersion)
             {
                 language = (Language)reader.ReadUInt32();
                 chatMode = (QuickChatModes)reader.ReadByte();
diff --git a/src/Impostor.Api/Net/Messages/Rpcs/Rpc35UpdateSystem.cs b/src/Impostor.Api/Net/Messages/Rpcs/Rpc35UpdateSystem.cs
index 269b865..0a0691d 100644
--- a/src/Impostor.Api/Net/Messages/Rpcs/Rpc35UpdateSystem.cs
+++ b/src/Impostor.Api/Net/Messages/Rpcs/Rpc35UpdateSystem.cs
@@ -6,20 +6,20 @@ namespace Impostor.Api.Net.Messages.Rpcs
 {
     public static class Rpc35UpdateSystem
     {
-        public static void Serialize(IMessageWriter writer, SystemTypes systemType, IInnerPlayerControl playerControl, ushort sid, byte state, byte ventId)
+        public static void Serialize(IMessageWriter writer, SystemTypes systemType, IInnerPlayerControl playerControl, ushort sequenceId, byte state, byte ventId)
         {
             writer.Write((byte)systemType);
             writer.Write(playerControl.NetId);
-            writer.Write(sid);
+            writer.Write(sequenceId);
             writer.Write(state);
             writer.Write(ventId);
         }
 
-        public static void Deserialize(IMessageReader reader, IGame game, out SystemTypes systemType, out IInnerPlayerControl? playerControl, out ushort sId, out byte state, out byte ventId)
+        public static void Deserialize(IMessageReader reader, IGame game, out SystemTypes systemType, out IInnerPlayerControl? playerControl, out ushort sequenceId, out byte state, out byte ventId)
         {
             systemType = (SystemTypes)reader.ReadByte();
             playerControl = reader.ReadNetObject<IInnerPlayerControl>(game);
-            sId = reader.ReadUInt16();
+            sequenceId = reader.ReadUInt16();
             state = reader.ReadByte();
             ventId = reader.ReadByte();
         }
diff --git a/src/Impostor.Server/Net/Inner/Objects/ShipStatus/InnerShipStatus.cs b/src/Impostor.Server/Net/Inner/Objects/ShipStatus/InnerShipStatus.cs
index 30338f1..6a462a3 100644
--- a/src/Impostor.Server/Net/Inner/Objects/ShipStatus/InnerShipStatus.cs
+++ b/src/Impostor.Server/Net/Inner/Objects/ShipStatus/InnerShipStatus.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
@@ -107,7 +107,7 @@ namespace Impostor.Server.Net.Inner.Objects.ShipStatus
 
                 case RpcCalls.UpdateSystem:
                 {
-                    Rpc35UpdateSystem.Deserialize(reader, Game, out var systemType, out var playerControl, out var sId, out var state, out var ventId);
+                    Rpc35UpdateSystem.Deserialize(reader, Game, out var systemType, out var playerControl, out var sequenceId, out var state, out var ventId);
                     break;
                 }