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

Merge pull request #12075 from pchote/fix-grey-ping-of-death

Browse Source 
Read data from *all* connections to the server.
This commit is contained in:
Oliver Brakmann
2016-09-21 17:45:59 +02:00
committed by GitHub
parent 999ddab5a4 093053fd93
commit b53874fc8e
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,17 +185,21 @@ namespace OpenRA.Server
foreach (var s in checkRead) foreach (var s in checkRead)
{ {
if (s == listener.Server) if (s == listener.Server)
{
AcceptConnection(); AcceptConnection();
else if (PreConns.Count > 0) continue;
{
var p = PreConns.SingleOrDefault(c => c.Socket == s);
if (p != null) p.ReadData(this);
} }
else if (Conns.Count > 0)
var preConn = PreConns.SingleOrDefault(c => c.Socket == s);
if (preConn != null)
{ {
preConn.ReadData(this);
continue;
}
var conn = Conns.SingleOrDefault(c => c.Socket == s); var conn = Conns.SingleOrDefault(c => c.Socket == s);
if (conn != null) conn.ReadData(this); if (conn != null)
} conn.ReadData(this);
} }
foreach (var t in serverTraits.WithInterface<ITick>()) foreach (var t in serverTraits.WithInterface<ITick>())