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

Don't tell the master server about local servers

Browse Source
This commit is contained in:
Paul Chote
2011-05-12 19:31:51 +12:00
parent f0f591c6fb
commit 5fffc9d816
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,17 +38,13 @@ namespace OpenRA.Mods.RA.Server
public void GameStarted(S server) { PingMasterServer(server); }
int lastPing = 0;
// Todo: use the settings passed to the server instead
bool isInternetServer = Game.Settings.Server.AdvertiseOnline;
string masterServerUrl = Game.Settings.Server.MasterServer;
int externalPort = Game.Settings.Server.ExternalPort;
bool isInitialPing = true;
volatile bool isBusy;
Queue<string> masterServerMessages = new Queue<string>();
public void PingMasterServer(S server)
{
if (isBusy || !isInternetServer) return;
if (isBusy || !server.AdvertiseOnline) return;
lastPing = Environment.TickCount;
isBusy = true;
@@ -64,8 +60,8 @@ namespace OpenRA.Mods.RA.Server
{
wc.Proxy = null;
wc.DownloadData(
masterServerUrl + url.F(
externalPort, Uri.EscapeUriString(server.Name),
Game.Settings.Server.MasterServer + url.F(
server.ExternalPort, Uri.EscapeUriString(server.Name),
server.GameStarted ? 2 : 1, // todo: post-game states, etc.
server.lobbyInfo.Clients.Count,
string.Join(",", Game.CurrentMods.Select(f => "{0}@{1}".F(f.Key, f.Value.Version)).ToArray()),

2
OpenRA.Mods.RA/Widgets/Delegates/CreateServerMenuDelegate.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
settings.Server.ExternalPort = int.Parse(cs.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text);
settings.Save();
Game.CreateServer(settings.Server.ListenPort, settings.Server.Name, map);
Game.CreateServer(settings.Server.Name, map,settings.Server.ListenPort, settings.Server.AdvertiseOnline, settings.Server.ExternalPort);
Game.JoinServer(IPAddress.Loopback.ToString(), settings.Server.ListenPort);
return true;
};