remove staticness on Server

OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs

@@ -14,7 +14,7 @@ using System.Linq;
 using OpenRA.Network;
 using OpenRA.FileFormats;
 using OpenRA.Server;
-using server = OpenRA.Server.Server;
+using S = OpenRA.Server.Server;
 
 namespace OpenRA.Mods.RA.Server
 {
@@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA.Server
 	{
 		public static int MaxSpectators = 4; // How many spectators to allow // @todo Expose this as an option
 
-		public bool InterpretCommand(Connection conn, Session.Client client, string cmd)
+		public bool InterpretCommand(S server, Connection conn, Session.Client client, string cmd)
 		{
 			if (server.GameStarted)
 			{
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA.Server
 						server.SyncLobbyInfo();
 						
 						if (server.conns.Count > 0 && server.conns.All(c => server.GetClient(c).State == Session.ClientState.Ready))
-							InterpretCommand(conn, client, "startgame");
+							InterpretCommand(server, conn, client, "startgame");
 						
 						return true;
 					}},
@@ -195,7 +195,7 @@ namespace OpenRA.Mods.RA.Server
 							return true;
 						}
 						server.lobbyInfo.GlobalSettings.Map = s;			
-						LoadMap();
+						LoadMap(server);
 
 						foreach(var c in server.lobbyInfo.Clients)
 						{
@@ -235,7 +235,7 @@ namespace OpenRA.Mods.RA.Server
 			return a(cmdValue);
 		}
 		
-		public void ServerStarted() { LoadMap(); }
+		public void ServerStarted(S server) { LoadMap(server); }
 		static Session.Slot MakeSlotFromPlayerReference(PlayerReference pr)
 		{
 			if (!pr.Playable) return null;
@@ -247,7 +247,7 @@ namespace OpenRA.Mods.RA.Server
 			};
 		}
 
-		public static void LoadMap()
+		public static void LoadMap(S server)
 		{
 			server.Map = new Map(server.ModData.AvailableMaps[server.lobbyInfo.GlobalSettings.Map]);
 			server.lobbyInfo.Slots = server.Map.Players
@@ -267,7 +267,7 @@ namespace OpenRA.Mods.RA.Server
 				});
 		}
 		
-		public void ClientJoined(Connection newConn)
+		public void ClientJoined(S server, Connection newConn)
 		{
 			var defaults = new GameRules.PlayerSettings();
 			
@@ -281,7 +281,7 @@ namespace OpenRA.Mods.RA.Server
 				State = Session.ClientState.NotReady,
 				SpawnPoint = 0,
 				Team = 0,
-				Slot = ChooseFreeSlot(),
+				Slot = ChooseFreeSlot(server),
 			};
 			
 			var slotData = server.lobbyInfo.Slots.FirstOrDefault( x => x.Index == client.Slot );
@@ -297,7 +297,7 @@ namespace OpenRA.Mods.RA.Server
 			server.SyncLobbyInfo();
 		}
 		
-		static int ChooseFreeSlot()
+		static int ChooseFreeSlot(S server)
 		{
 			return server.lobbyInfo.Slots.First(s => !s.Closed && s.Bot == null 
 				&& !server.lobbyInfo.Clients.Any( c => c.Slot == s.Index )).Index;

OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using OpenRA.Server;
-using server = OpenRA.Server.Server;
+using S = OpenRA.Server.Server;
 
 namespace OpenRA.Mods.RA.Server
 {
@@ -21,10 +21,10 @@ namespace OpenRA.Mods.RA.Server
 		const int MasterPingInterval = 60 * 3;	// 3 minutes. server has a 5 minute TTL for games, so give ourselves a bit
 												// of leeway.
 		public int TickTimeout { get { return MasterPingInterval * 10000; } }
-		public void Tick()
+		public void Tick(S server)
 		{
 			if (Environment.TickCount - lastPing > MasterPingInterval * 1000)
-				PingMasterServer();
+				PingMasterServer(server);
 			else
 				lock (masterServerMessages)
 					while (masterServerMessages.Count > 0)
@@ -33,8 +33,8 @@ namespace OpenRA.Mods.RA.Server
 		}
 		
 		
-		public void LobbyInfoSynced() { PingMasterServer(); }
-		public void GameStarted() { PingMasterServer(); }
+		public void LobbyInfoSynced(S server) { PingMasterServer(server); }
+		public void GameStarted(S server) { PingMasterServer(server); }
 
 		static int lastPing = 0;
 		// Todo: use the settings passed to the server instead
@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Server
 		
 		static volatile bool isBusy;
 		static Queue<string> masterServerMessages = new Queue<string>();
-		public static void PingMasterServer()
+		public static void PingMasterServer(S server)
 		{
 			if (isBusy || !isInternetServer) return;
 

OpenRA.Mods.RA/ServerTraits/PlayerCommands.cs

@@ -14,13 +14,13 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Network;
 using OpenRA.Server;
-using server = OpenRA.Server.Server;
+using S = OpenRA.Server.Server;
 
 namespace OpenRA.Mods.RA.Server
 {		
 	public class PlayerCommands : ServerTrait, IInterpretCommand
 	{
-		public bool InterpretCommand(Connection conn, Session.Client client, string cmd)
+		public bool InterpretCommand( S server, Connection conn, Session.Client client, string cmd)
 		{
 			if (server.GameStarted)
 			{