From 5d5fe3f5a1dbc86aed1da9aa3ea12f9e886ba3cc Mon Sep 17 00:00:00 2001 From: Igor Popov Date: Sun, 1 Jul 2012 16:40:19 +0400 Subject: [PATCH] dedicated: proper reason why DEV_VERSION is kicked. --- OpenRA.Game/Server/Server.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 663d479254..e771399732 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -265,9 +265,6 @@ namespace OpenRA.Server mods.Select( m => Pair.New(m.Split('@')[0], m.Split('@')[1])).All(kv => Game.CurrentMods.ContainsKey(kv.First) && (kv.Second == "{DEV_VERSION}" || Game.CurrentMods[kv.First].Version == "{DEV_VERSION}" || kv.Second == Game.CurrentMods[kv.First].Version)); - // Drop DEV_VERSION if it's a Dedicated - if ( lobbyInfo.GlobalSettings.Dedicated && mods.Any(m => m.Contains("{DEV_VERSION}")) ) { valid = false; } - if (!valid) { Log.Write("server", "Rejected connection from {0}; mods do not match.", @@ -277,6 +274,17 @@ namespace OpenRA.Server DropClient(newConn); return; } + + // Drop DEV_VERSION if it's a Dedicated + if ( lobbyInfo.GlobalSettings.Dedicated && mods.Any(m => m.Contains("{DEV_VERSION}")) ) + { + Log.Write("server", "Rejected connection from {0}; DEV_VERSION is not allowed here.", + newConn.socket.RemoteEndPoint); + + SendOrderTo(newConn, "ServerError", "DEV_VERSION is not allowed here"); + DropClient(newConn); + return; + } // Check if IP is banned if (lobbyInfo.GlobalSettings.Ban != null)