epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dedicated: proper reason why DEV_VERSION is kicked.

Browse Source
This commit is contained in:
Igor Popov
2012-07-01 16:40:19 +04:00
committed by Chris Forbes
parent 5bacf69445
commit 5d5fe3f5a1
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Server/Server.cs
View File

@@ -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) && 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)); (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) if (!valid)
{ {
Log.Write("server", "Rejected connection from {0}; mods do not match.", Log.Write("server", "Rejected connection from {0}; mods do not match.",
@@ -278,6 +275,17 @@ namespace OpenRA.Server
return; 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 // Check if IP is banned
if (lobbyInfo.GlobalSettings.Ban != null) if (lobbyInfo.GlobalSettings.Ban != null)
{ {