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

Fix: Game can no longer drop you in a single player game.

Browse Source
This commit is contained in:
WolfGaming
2014-12-04 09:26:57 +00:00
parent 8e001663dc
commit f191babec8
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenRA.Mods.Common/ServerTraits/PlayerPinger.cs
View File

@@ -34,37 +34,46 @@ namespace OpenRA.Mods.Common.Server
{ {
isInitialPing = false; isInitialPing = false;
lastPing = Game.RunTime; lastPing = Game.RunTime;
foreach (var c in server.Conns.ToList())
if (server.LobbyInfo.IsSinglePlayer && server.Conns.Any() && server.GetClient(server.Conns.First()).IpAddress == "127.0.0.1")
{ {
if (c.TimeSinceLastResponse < ConnTimeout) foreach (var c in server.Conns.ToList())
{
server.SendOrderTo(c, "Ping", Game.RunTime.ToString()); server.SendOrderTo(c, "Ping", Game.RunTime.ToString());
if (!c.TimeoutMessageShown && c.TimeSinceLastResponse > PingInterval * 2) }
else
{
foreach (var c in server.Conns.ToList())
{
if (c.TimeSinceLastResponse < ConnTimeout)
{ {
server.SendMessage(server.GetClient(c).Name + " is experiencing connection problems."); server.SendOrderTo(c, "Ping", Game.RunTime.ToString());
c.TimeoutMessageShown = true; if (!c.TimeoutMessageShown && c.TimeSinceLastResponse > PingInterval * 2)
{
server.SendMessage(server.GetClient(c).Name + " is experiencing connection problems.");
c.TimeoutMessageShown = true;
}
}
else
{
server.SendMessage(server.GetClient(c).Name + " has been dropped after timing out.");
server.DropClient(c, -1);
} }
} }
else
if (Game.RunTime - lastConnReport > ConnReportInterval)
{ {
server.SendMessage(server.GetClient(c).Name + " has been dropped after timing out."); lastConnReport = Game.RunTime;
server.DropClient(c, -1);
var timeouts = server.Conns
.Where(c => c.TimeSinceLastResponse > ConnReportInterval && c.TimeSinceLastResponse < ConnTimeout)
.OrderBy(c => c.TimeSinceLastResponse);
foreach (var c in timeouts)
server.SendMessage("{0} will be dropped in {1} seconds.".F(
server.GetClient(c).Name, (ConnTimeout - c.TimeSinceLastResponse) / 1000));
} }
} }
} }
if (Game.RunTime - lastConnReport > ConnReportInterval)
{
lastConnReport = Game.RunTime;
var timeouts = server.Conns
.Where(c => c.TimeSinceLastResponse > ConnReportInterval && c.TimeSinceLastResponse < ConnTimeout)
.OrderBy(c => c.TimeSinceLastResponse);
foreach (var c in timeouts)
server.SendMessage("{0} will be dropped in {1} seconds.".F(
server.GetClient(c).Name, (ConnTimeout - c.TimeSinceLastResponse) / 1000));
}
} }
} }
} }