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

Simplify admin promotion check in ValidateClient.

Browse Source 
This also fixes a crash if we want to allow
multiple admins in a server.
This commit is contained in:
Paul Chote
2013-06-05 22:13:44 +12:00
parent 8c9fb382e3
commit 18f1683968
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,11 +293,10 @@ namespace OpenRA.Server
lobbyInfo.Clients.Add(client); lobbyInfo.Clients.Add(client);
// Assume that first validated client is server admin // Promote to admin if this is the first client
if (lobbyInfo.Clients.Where(c1 => c1.Bot == null).Count() == 1) var clientAdmin = lobbyInfo.Clients.Where(c1 => c1.IsAdmin).FirstOrDefault() ?? client;
client.IsAdmin=true; if (clientAdmin == client)
client.IsAdmin = true;
OpenRA.Network.Session.Client clientAdmin = lobbyInfo.Clients.Where(c1 => c1.IsAdmin).Single();
Log.Write("server", "Client {0}: Accepted connection from {1}.", Log.Write("server", "Client {0}: Accepted connection from {1}.",
newConn.PlayerIndex, newConn.socket.RemoteEndPoint); newConn.PlayerIndex, newConn.socket.RemoteEndPoint);