Update Protocols

opengsq · Jan 26, 2024 · 86824eb · 86824eb
1 parent 1a20b60
commit 86824eb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/OpenGSQ/Exceptions/InvalidPacketException.cs b/OpenGSQ/Exceptions/InvalidPacketException.cs
@@ -30,12 +30,12 @@ public static void ThrowIfNotEqual<T>(T received, T expected)
         {
             if (typeof(T) == typeof(byte[]))
             {
-                if (!(received as byte[]).SequenceEqual(expected as byte[]))
+                if (!(received as byte[])!.SequenceEqual((expected as byte[])!))
                 {
                     throw new InvalidPacketException(GetMessage(received, expected));
                 }
             }
-            else if (!received.Equals(expected))
+            else if (!received!.Equals(expected))
             {
                 throw new InvalidPacketException(GetMessage(received, expected));
             }
@@ -48,13 +48,13 @@ private static string GetMessage<T>(T received, T expected)
 
             if (typeof(T) == typeof(byte[]))
             {
-                receivedStr = BitConverter.ToString(received as byte[]);
-                expectedStr = BitConverter.ToString(expected as byte[]);
+                receivedStr = BitConverter.ToString((received as byte[])!);
+                expectedStr = BitConverter.ToString((expected as byte[])!);
             }
             else
             {
-                receivedStr = received.ToString();
-                expectedStr = expected.ToString();
+                receivedStr = received!.ToString()!;
+                expectedStr = expected!.ToString()!;
             }
 
             return $"Packet header mismatch. Received: {receivedStr}. Expected: {expectedStr}.";

diff --git a/OpenGSQ/Protocols/Minecraft.cs b/OpenGSQ/Protocols/Minecraft.cs
@@ -72,6 +72,11 @@ public async Task<Dictionary<string, object>> GetStatus(int version = 47)
                     // The packet may respond with two json objects, so we need to get the json length exactly
                     var data = JsonSerializer.Deserialize<Dictionary<string, object>>(Encoding.UTF8.GetString(br.ReadBytes(count)));
 
+                    if (data == null)
+                    {
+                        throw new InvalidOperationException("Failed to deserialize the response into a dictionary. The response might be empty or not in the expected format.");
+                    }
+
                     return data;
                 }
             }

diff --git a/OpenGSQ/RconProtocols/SourceRcon.cs b/OpenGSQ/RconProtocols/SourceRcon.cs
@@ -97,6 +97,11 @@ public async Task Authenticate(string password)
         /// <exception cref="TimeoutException">Thrown when the operation times out.</exception>
         public async Task<string> SendCommand(string command)
         {
+            if (_tcpClient == null)
+            {
+                throw new InvalidOperationException("The client is not authenticated. Please ensure that the Authenticate() method has been successfully called before attempting to send a command.");
+            }
+
             // Send the command and a empty command packet
             int id = new Random().Next(4096), dummyId = id + 1;
             await _tcpClient.SendAsync(new Packet(id, PacketType.SERVERDATA_EXECCOMMAND, command).GetBytes());