From 2eebf4f48d2c83752c18af2961b3c21f0b0065da Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Wed, 16 Aug 2023 00:20:26 -0700
Subject: [PATCH] fix: Fixes crashing while trying to detect old clients
 (#1459)

---
 Projects/Server/Client/ClientVersion.cs |  2 +-
 Projects/Server/Client/UOClient.cs      | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Projects/Server/Client/ClientVersion.cs b/Projects/Server/Client/ClientVersion.cs
index ea82b9d5f..effcac920 100644
--- a/Projects/Server/Client/ClientVersion.cs
+++ b/Projects/Server/Client/ClientVersion.cs
@@ -85,7 +85,7 @@ public class ClientVersion : IComparable<ClientVersion>, IComparer<ClientVersion
                 {
                     if (!char.IsWhiteSpace(fmt, br3))
                     {
-                        Patch = fmt[br3] - 'a' + 1;
+                        Patch = fmt[br3] - 'a';
                     }
                 }
                 else
diff --git a/Projects/Server/Client/UOClient.cs b/Projects/Server/Client/UOClient.cs
index 9734a7b18..71d0d1d54 100644
--- a/Projects/Server/Client/UOClient.cs
+++ b/Projects/Server/Client/UOClient.cs
@@ -105,19 +105,17 @@ public static class UOClient
                 0x4E, 0x00, 0x46, 0x00, 0x4F, 0x00
             };
 
-            for (var i = 0; i < buffer.Length; i++)
+            var versionIndex = buffer.AsSpan().IndexOf(vsVersionInfo);
+            if (versionIndex > -1)
             {
-                if (vsVersionInfo.SequenceEqual(buffer.AsSpan(i, 30)))
-                {
-                    var offset = i + 42; // 30 + 12
+                var offset = versionIndex + 42; // 30 + 12
 
-                    var minorPart = BinaryPrimitives.ReadUInt16LittleEndian(buffer.AsSpan(offset));
-                    var majorPart = BinaryPrimitives.ReadUInt16LittleEndian(buffer.AsSpan(offset + 2));
-                    var privatePart = BinaryPrimitives.ReadUInt16LittleEndian(buffer.AsSpan(offset + 4));
-                    var buildPart = BinaryPrimitives.ReadUInt16LittleEndian(buffer.AsSpan(offset + 6));
+                var minorPart = BinaryPrimitives.ReadUInt16LittleEndian(buffer.AsSpan(offset));
+                var majorPart = BinaryPrimitives.ReadUInt16LittleEndian(buffer.AsSpan(offset + 2));
+                var privatePart = BinaryPrimitives.ReadUInt16LittleEndian(buffer.AsSpan(offset + 4));
+                var buildPart = BinaryPrimitives.ReadUInt16LittleEndian(buffer.AsSpan(offset + 6));
 
-                    return new ClientVersion(majorPart, minorPart, buildPart, privatePart);
-                }
+                return new ClientVersion(majorPart, minorPart, buildPart, privatePart);
             }
         }