Fix ExitAction OutputCodes handling

MultiAdmin/Features/MemoryChecker.cs

@@ -73,7 +73,7 @@ public void OnRoundEnd()
 
 			Server.Write("Restarting due to low memory (Round End)...", ConsoleColor.Red);
 
-			Server.SoftRestartServer();
+			Server.RestartServer();
 
 			Init();
 		}
@@ -111,7 +111,7 @@ public void OnTick()
 			if (tickCount >= MaxTicks)
 			{
 				Server.Write("Restarting due to low memory...", ConsoleColor.Red);
-				Server.SoftRestartServer();
+				Server.RestartServer();
 
 				restart = false;
 			}

MultiAdmin/Features/Restart.cs

@@ -26,7 +26,7 @@ public string GetUsage()
 
 		public void OnCall(string[] args)
 		{
-			Server.SoftRestartServer();
+			Server.RestartServer();
 		}
 
 		public bool PassToGame()

MultiAdmin/Features/RestartRoundCounter.cs

@@ -28,7 +28,7 @@ public void OnRoundEnd()
 			{
 				Server.Write($"{count}/{restartAfter} rounds have passed, restarting...");
 
-				Server.SoftRestartServer();
+				Server.RestartServer();
 				count = 0;
 			}
 		}

MultiAdmin/Program.cs

@@ -15,7 +15,7 @@ namespace MultiAdmin
 {
 	public static class Program
 	{
-		public const string MaVersion = "3.3.1.1";
+		public const string MaVersion = "3.3.1.2";
 		public const string RecommendedMonoVersion = "5.18";
 
 		private static readonly List<Server> InstantiatedServers = new List<Server>();

MultiAdmin/Server.cs

@@ -116,6 +116,19 @@ private set
 
 		public bool IsLoading { get; set; }
 
+		public bool SetServerRequestedStatus(ServerStatus status)
+		{
+			// Don't override the console's own requests
+			if (IsStopping)
+			{
+				return false;
+			}
+
+			Status = status;
+
+			return true;
+		}
+
 		#endregion
 
 		private string startDateTime;
@@ -192,8 +205,7 @@ private void MainLoop()
 				if (Status == ServerStatus.Restarting && CheckRestartTimeout)
 				{
 					Write("Server restart timed out, killing the server process...", ConsoleColor.Red);
-					if (IsGameProcessRunning)
-						GameProcess.Kill();
+					RestartServer(true);
 				}
 
 				if (Status == ServerStatus.Stopping && CheckStopTimeout)
@@ -398,12 +410,14 @@ public void StartServer(bool restartOnCrash = true)
 						{
 							case ServerStatus.Stopping:
 							case ServerStatus.ForceStopping:
+							case ServerStatus.ExitActionStop:
 								Status = ServerStatus.Stopped;
 
 								shouldRestart = false;
 								break;
 
 							case ServerStatus.Restarting:
+							case ServerStatus.ExitActionRestart:
 								shouldRestart = true;
 								break;
 
@@ -503,14 +517,13 @@ public void SetRestartStatus()
 			Status = ServerStatus.Restarting;
 		}
 
-		public void SoftRestartServer(bool killGame = false)
+		public void RestartServer(bool killGame = false)
 		{
 			if (!IsRunning) throw new Exceptions.ServerNotRunningException();
 
 			SetRestartStatus();
 
-			SendMessage("SOFTRESTART");
-			if (killGame && IsGameProcessRunning)
+			if ((killGame || !SendMessage("SOFTRESTART")) && IsGameProcessRunning)
 				GameProcess.Kill();
 		}
 
@@ -719,8 +732,10 @@ public enum ServerStatus
 		Starting,
 		Running,
 		Stopping,
+		ExitActionStop,
 		ForceStopping,
 		Restarting,
+		ExitActionRestart,
 		Stopped,
 		StoppedUnexpectedly
 	}

MultiAdmin/ServerIO/OutputHandler.cs

@@ -24,9 +24,13 @@ private enum OutputCodes : byte
 			ExitActionReset = 0x13,
 			ExitActionShutdown = 0x14,
 			ExitActionSilentShutdown = 0x15,
-			ExitActionRestart = 0x16
+			ExitActionRestart = 0x16,
+			RoundEnd = 0x17
 		}
 
+		// Temporary measure to handle round ends until the game updates to use this
+		private bool roundEndCodeUsed = false;
+
 		public OutputHandler(Server server)
 		{
 			this.server = server;
@@ -95,7 +99,8 @@ public void HandleMessage(object source, ServerSocket.MessageEventArgs message)
 					switch (lowerMessage.Trim(TrimChars))
 					{
 						case "the round is about to restart! please wait":
-							server.ForEachHandler<IEventRoundEnd>(roundEnd => roundEnd.OnRoundEnd());
+							if (!roundEndCodeUsed)
+								server.ForEachHandler<IEventRoundEnd>(roundEnd => roundEnd.OnRoundEnd());
 							break;
 
 						/* Replaced by OutputCodes.RoundRestart
@@ -133,7 +138,8 @@ public void HandleMessage(object source, ServerSocket.MessageEventArgs message)
 					switch (@event)
 					{
 						case "round-end-event":
-							server.ForEachHandler<IEventRoundEnd>(roundEnd => roundEnd.OnRoundEnd());
+							if (!roundEndCodeUsed)
+								server.ForEachHandler<IEventRoundEnd>(roundEnd => roundEnd.OnRoundEnd());
 							break;
 
 						/* Replaced by OutputCodes.RoundRestart
@@ -189,20 +195,29 @@ public void HandleAction(object source, byte action)
 					server.ForEachHandler<IEventIdleExit>(idleExit => idleExit.OnIdleExit());
 					break;
 
+				// Requests to reset the ExitAction status
 				case OutputCodes.ExitActionReset:
-					server.SetRestartStatus();
+					server.SetServerRequestedStatus(ServerStatus.Running);
 					break;
 
+				// Requests the Shutdown ExitAction with the intent to restart at any time in the future
 				case OutputCodes.ExitActionShutdown:
-					server.SetStopStatus();
+					server.SetServerRequestedStatus(ServerStatus.ExitActionStop);
 					break;
 
+				// Requests the SilentShutdown ExitAction with the intent to restart at any time in the future
 				case OutputCodes.ExitActionSilentShutdown:
-					server.SetStopStatus();
+					server.SetServerRequestedStatus(ServerStatus.ExitActionStop);
 					break;
 
+				// Requests the Restart ExitAction status with the intent to restart at any time in the future
 				case OutputCodes.ExitActionRestart:
-					server.SetRestartStatus();
+					server.SetServerRequestedStatus(ServerStatus.ExitActionRestart);
+					break;
+
+				case OutputCodes.RoundEnd:
+					roundEndCodeUsed = true;
+					server.ForEachHandler<IEventRoundEnd>(roundEnd => roundEnd.OnRoundEnd());
 					break;
 
 				default: