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

send 'spectators' and 'protected' to master server; fixes #6041

Browse Source
This commit is contained in:
ihptru
2014-07-23 20:31:53 +04:00
parent 51316a76cc
commit 26a6f45b8f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs
View File

@@ -54,14 +54,16 @@ namespace OpenRA.Mods.RA.Server
// important to grab these on the main server thread, not in the worker we're about to spawn -- they may be modified // important to grab these on the main server thread, not in the worker we're about to spawn -- they may be modified
// by the main thread as clients join and leave. // by the main thread as clients join and leave.
var numPlayers = server.LobbyInfo.Clients.Where(c1 => c1.Bot == null).Count(); var numPlayers = server.LobbyInfo.Clients.Where(c1 => c1.Bot == null && c1.Slot != null).Count();
var numBots = server.LobbyInfo.Clients.Where(c1 => c1.Bot != null).Count(); var numBots = server.LobbyInfo.Clients.Where(c1 => c1.Bot != null).Count();
var numSpectators = server.LobbyInfo.Clients.Where(c1 => c1.Bot == null && c1.Slot == null).Count();
var passwordProtected = string.IsNullOrEmpty(server.Settings.Password) ? 0 : 1;
Action a = () => Action a = () =>
{ {
try try
{ {
var url = "ping.php?port={0}&name={1}&state={2}&players={3}&bots={4}&mods={5}&map={6}&maxplayers={7}"; var url = "ping.php?port={0}&name={1}&state={2}&players={3}&bots={4}&mods={5}&map={6}&maxplayers={7}&spectators={8}&protected={9}";
if (isInitialPing) url += "&new=1"; if (isInitialPing) url += "&new=1";
using (var wc = new WebClient()) using (var wc = new WebClient())
@@ -75,7 +77,9 @@ namespace OpenRA.Mods.RA.Server
numBots, numBots,
"{0}@{1}".F(mod.Id, mod.Version), "{0}@{1}".F(mod.Id, mod.Version),
server.LobbyInfo.GlobalSettings.Map, server.LobbyInfo.GlobalSettings.Map,
server.Map.PlayerCount)); server.Map.PlayerCount,
numSpectators,
passwordProtected));
if (isInitialPing) if (isInitialPing)
{ {