Merge pull request #286 from CitiesSkylinesMultiplayer/fix-null-mods

Fix exception on empty mod list
CitiesSkylinesMultiplayer · Sep 15, 2022 · 0970697 · 0970697
2 parents 51c638c + 52f1a8a
commit 0970697
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/csm/Commands/Handler/Internal/ConnectionRequestHandler.cs b/src/csm/Commands/Handler/Internal/ConnectionRequestHandler.cs
@@ -110,9 +110,10 @@ public void HandleOnServer(ConnectionRequestCommand command, NetPeer peer)
             }
 
             List<string> mods = ModSupport.Instance.RequiredModsForSync;
-            if (!command.Mods.SequenceEqual(mods))
+            List<string> clientMods = command.Mods ?? new List<string>();
+            if (!clientMods.SequenceEqual(mods))
             {
-                Log.Info($"Connection rejected: List of mods [{string.Join(", ", command.Mods.ToArray())}] (client) and [{string.Join(", ", mods.ToArray())}] (server) differ.");
+                Log.Info($"Connection rejected: List of mods [{string.Join(", ", clientMods.ToArray())}] (client) and [{string.Join(", ", mods.ToArray())}] (server) differ.");
                 CommandInternal.Instance.SendToClient(peer, new ConnectionResultCommand
                 {
                     Success = false,

diff --git a/src/csm/Commands/Handler/Internal/ConnectionResultHandler.cs b/src/csm/Commands/Handler/Internal/ConnectionResultHandler.cs
@@ -53,7 +53,7 @@ protected override void Handle(ConnectionResultCommand command)
                 else if (command.Reason.Contains("Mods"))
                 {
                     List<string> clientMods = ModSupport.Instance.RequiredModsForSync;
-                    List<string> serverMods = command.Mods;
+                    List<string> serverMods = command.Mods ?? new List<string>();
 
                     IEnumerable<string> clientNotServer = clientMods.Where(mod => !serverMods.Contains(mod));
                     IEnumerable<string> serverNotClient = serverMods.Where(mod => !clientMods.Contains(mod));