diff --git a/src/api/Properties/AssemblyInfo.cs b/src/api/Properties/AssemblyInfo.cs index b124d5e1..609794b3 100644 --- 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 index 1b3540b6..f7d66e6a 100644 --- 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 index f969c9e2..6220d0df 100644 --- 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 mods = ModSupport.Instance.RequiredModsForSync; - List clientMods = command.Mods ?? new List(); - if (!clientMods.SequenceEqual(mods)) + List serverMods = ModSupport.Instance.RequiredModsForSync.OrderBy(x => x).ToList(); + List clientMods = (command.Mods ?? new List()).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 index ca876305..ea8dab90 100644 --- 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("")]