From 1f4162288e71b147f1bf1137c3b9139f441ceb3f Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Mon, 28 Feb 2022 17:24:00 -0800
Subject: [PATCH] fix: Fixes UOClient NPE (#952)

---
 Projects/Server/Client/UOClient.cs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Projects/Server/Client/UOClient.cs b/Projects/Server/Client/UOClient.cs
index e19b801f3..583d3dc81 100644
--- a/Projects/Server/Client/UOClient.cs
+++ b/Projects/Server/Client/UOClient.cs
@@ -46,20 +46,21 @@ public static class UOClient
     {
         if (ServerClientVersion == null)
         {
-            logger.Warning("Could not detect client version.");
+            logger.Warning("Could not detect client version. This may cause data files to load improperly.");
+            return;
         }
-        else if (CuoSettings.ClientVersion == ServerClientVersion)
+
+        if (_automaticallyDetected)
         {
-            logger.Information($"Automatically detected client version {ServerClientVersion} from CUO settings.");
-        }
-        else if (_automaticallyDetected)
-        {
-            logger.Information($"Automatically detected client version {ServerClientVersion}");
-        }
-        else
-        {
-            logger.Information($"Manually configured to use client version {ServerClientVersion}");
+            logger.Information(
+                CuoSettings?.ClientVersion == ServerClientVersion
+                    ? $"Automatically detected client version {ServerClientVersion} from CUO settings."
+                    : $"Automatically detected client version {ServerClientVersion}"
+            );
+            return;
         }
+
+        logger.Information($"Manually configured to use client version {ServerClientVersion}");
     }
 
     private static ClientVersion DetectCUOClient()