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

Avoid duplication in server messages and fix a typo.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-08-21 18:04:59 +02:00
parent 0a4a08c29e
commit 880d848a66
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,8 @@ namespace OpenRA.Server
public class Server public class Server
{ {
public readonly string TwoHumansRequiredText = "This server requires at least two human players to start a match.";
public readonly IPAddress Ip; public readonly IPAddress Ip;
public readonly int Port; public readonly int Port;
public readonly MersenneTwister Random = new MersenneTwister(); public readonly MersenneTwister Random = new MersenneTwister();
@@ -396,7 +398,7 @@ namespace OpenRA.Server
SendOrderTo(newConn, "Message", "This map contains custom rules. Game experience may change."); SendOrderTo(newConn, "Message", "This map contains custom rules. Game experience may change.");
if (!LobbyInfo.GlobalSettings.EnableSingleplayer) if (!LobbyInfo.GlobalSettings.EnableSingleplayer)
SendOrderTo(newConn, "Message", "This server requires at least two human players to start a match."); SendOrderTo(newConn, "Message", TwoHumansRequiredText);
else if (Map.Players.Players.Where(p => p.Value.Playable).All(p => !p.Value.AllowBots)) else if (Map.Players.Players.Where(p => p.Value.Playable).All(p => !p.Value.AllowBots))
SendOrderTo(newConn, "Message", "Bots have been disabled on this map."); SendOrderTo(newConn, "Message", "Bots have been disabled on this map.");

4
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -126,7 +126,7 @@ namespace OpenRA.Mods.Common.Server
if (!server.LobbyInfo.GlobalSettings.EnableSingleplayer && if (!server.LobbyInfo.GlobalSettings.EnableSingleplayer &&
server.LobbyInfo.Clients.Where(c => c.Bot == null && c.Slot != null).Count() == 1) server.LobbyInfo.Clients.Where(c => c.Bot == null && c.Slot != null).Count() == 1)
{ {
server.SendOrderTo(conn, "Message", "This server requires at least two human players to start match."); server.SendOrderTo(conn, "Message", server.TwoHumansRequiredText);
return true; return true;
} }
@@ -404,7 +404,7 @@ namespace OpenRA.Mods.Common.Server
server.SendMessage("This map contains custom rules. Game experience may change."); server.SendMessage("This map contains custom rules. Game experience may change.");
if (!server.LobbyInfo.GlobalSettings.EnableSingleplayer) if (!server.LobbyInfo.GlobalSettings.EnableSingleplayer)
server.SendMessage("This server requires at least two human players to start match."); server.SendMessage(server.TwoHumansRequiredText);
else if (server.Map.Players.Players.Where(p => p.Value.Playable).All(p => !p.Value.AllowBots)) else if (server.Map.Players.Players.Where(p => p.Value.Playable).All(p => !p.Value.AllowBots))
server.SendMessage("Bots have been disabled on this map."); server.SendMessage("Bots have been disabled on this map.");
}; };