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

Merge pull request #10536 from Mailaender/warn-nobots

Browse Source 
Added a warning when bots have been disabled
This commit is contained in:
abcdefg30
2016-01-25 16:35:42 +01:00
parent 085367ced6 eb9fb75d3c
commit 386acdcfc9
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,6 +395,11 @@ namespace OpenRA.Server
if (Map.RuleDefinitions.Any() && !LobbyInfo.IsSinglePlayer) if (Map.RuleDefinitions.Any() && !LobbyInfo.IsSinglePlayer)
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 (Settings.LockBots)
SendOrderTo(newConn, "Message", "Bots have been disabled on this server.");
else if (MapPlayers.Players.Where(p => p.Value.Playable).All(p => !p.Value.AllowBots))
SendOrderTo(newConn, "Message", "Bots have been disabled on this map.");
if (handshake.Mod == "{DEV_VERSION}") if (handshake.Mod == "{DEV_VERSION}")
SendMessage("{0} is running an unversioned development build, ".F(client.Name) + SendMessage("{0} is running an unversioned development build, ".F(client.Name) +
"and may desynchronize the game state if they have incompatible rules."); "and may desynchronize the game state if they have incompatible rules.");

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

@@ -381,6 +381,11 @@ namespace OpenRA.Mods.Common.Server
if (server.Map.RuleDefinitions.Any()) if (server.Map.RuleDefinitions.Any())
server.SendMessage("This map contains custom rules. Game experience may change."); server.SendMessage("This map contains custom rules. Game experience may change.");
if (server.Settings.LockBots)
server.SendMessage("Bots have been disabled on this server.");
else if (server.MapPlayers.Players.Where(p => p.Value.Playable).All(p => !p.Value.AllowBots))
server.SendMessage("Bots have been disabled on this map.");
return true; return true;
} }
}, },