Change company in assembly files, order mods so SequenceOrder will wo…

…rk. (#294) Fixes #288
CitiesSkylinesMultiplayer · Oct 6, 2022 · 40db973 · 40db973
1 parent 42fc9f7
commit 40db973
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/api/Properties/AssemblyInfo.cs b/src/api/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
 [assembly: AssemblyTitle("Cities: Skylines Multiplayer Mod API")]
 [assembly: AssemblyDescription("API for Multiplayer mod for Cities: Skylines")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Grid Entertainment")]
+[assembly: AssemblyCompany("CSM Developers")]
 [assembly: AssemblyProduct("Cities: Skylines Multiplayer Mod API")]
 [assembly: AssemblyCopyright("Copyright © CSM Developers 2022")]
 [assembly: AssemblyTrademark("")]

diff --git a/src/basegame/Properties/AssemblyInfo.cs b/src/basegame/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
 [assembly: AssemblyTitle("Cities: Skylines Multiplayer Mod Basegame Logic")]
 [assembly: AssemblyDescription("BaseGame logic for Cities: Skylines Multiplayer")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Grid Entertainment")]
+[assembly: AssemblyCompany("CSM Developers")]
 [assembly: AssemblyProduct("Cities: Skylines Multiplayer Mod")]
 [assembly: AssemblyCopyright("Copyright © CSM Developers 2022")]
 [assembly: AssemblyTrademark("")]

diff --git a/src/csm/Commands/Handler/Internal/ConnectionRequestHandler.cs b/src/csm/Commands/Handler/Internal/ConnectionRequestHandler.cs
@@ -109,16 +109,17 @@ public void HandleOnServer(ConnectionRequestCommand command, NetPeer peer)
                 return;
             }
 
-            List<string> mods = ModSupport.Instance.RequiredModsForSync;
-            List<string> clientMods = command.Mods ?? new List<string>();
-            if (!clientMods.SequenceEqual(mods))
+            List<string> serverMods = ModSupport.Instance.RequiredModsForSync.OrderBy(x => x).ToList();
+            List<string> clientMods = (command.Mods ?? new List<string>()).OrderBy(x => x).ToList();
+
+            if (!clientMods.SequenceEqual(serverMods))
             {
-                Log.Info($"Connection rejected: List of mods [{string.Join(", ", clientMods.ToArray())}] (client) and [{string.Join(", ", mods.ToArray())}] (server) differ.");
+                Log.Info($"Connection rejected: List of mods [{string.Join(", ", clientMods.ToArray())}] (client) and [{string.Join(", ", serverMods.ToArray())}] (server) differ.");
                 CommandInternal.Instance.SendToClient(peer, new ConnectionResultCommand
                 {
                     Success = false,
                     Reason = "Mods don't match",
-                    Mods = mods
+                    Mods = serverMods
                 });
                 return;
             }

diff --git a/src/csm/Properties/AssemblyInfo.cs b/src/csm/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
 [assembly: AssemblyTitle("Cities: Skylines Multiplayer Mod")]
 [assembly: AssemblyDescription("Multiplayer mod for Cities: Skylines")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Grid Entertainment")]
+[assembly: AssemblyCompany("CSM Developers")]
 [assembly: AssemblyProduct("Cities: Skylines Multiplayer Mod")]
 [assembly: AssemblyCopyright("Copyright © CSM Developers 2022")]
 [assembly: AssemblyTrademark("")]