Merge pull request #246 from ServerMod/output-code-handling

Handle Exit Status OutputCodes

Author: Dankrushen

MultiAdmin/Server.cs

@@ -473,25 +473,39 @@ public void StartServer(bool restartOnCrash = true)
 			} while (shouldRestart);
 		}
 
-		public void StopServer(bool killGame = false)
+		public void SetStopStatus(bool killGame = false)
 		{
 			if (!IsRunning) throw new Exceptions.ServerNotRunningException();
 
 			initStopTimeoutTime = DateTime.Now;
 			Status = killGame ? ServerStatus.ForceStopping : ServerStatus.Stopping;
 
 			ForEachHandler<IEventServerStop>(stopEvent => stopEvent.OnServerStop());
+		}
+
+		public void StopServer(bool killGame = false)
+		{
+			if (!IsRunning) throw new Exceptions.ServerNotRunningException();
+
+			SetStopStatus(killGame);
 
 			if ((killGame || !SendMessage("QUIT")) && IsGameProcessRunning)
 				GameProcess.Kill();
 		}
 
-		public void SoftRestartServer(bool killGame = false)
+		public void SetRestartStatus()
 		{
 			if (!IsRunning) throw new Exceptions.ServerNotRunningException();
 
 			initRestartTimeoutTime = DateTime.Now;
 			Status = ServerStatus.Restarting;
+		}
+
+		public void SoftRestartServer(bool killGame = false)
+		{
+			if (!IsRunning) throw new Exceptions.ServerNotRunningException();
+
+			SetRestartStatus();
 
 			SendMessage("SOFTRESTART");
 			if (killGame && IsGameProcessRunning)

MultiAdmin/ServerIO/OutputHandler.cs

@@ -189,11 +189,20 @@ public void HandleAction(object source, byte action)
 					server.ForEachHandler<IEventIdleExit>(idleExit => idleExit.OnIdleExit());
 					break;
 
-				// Unhandled for now
 				case OutputCodes.ExitActionReset:
+					server.SetRestartStatus();
+					break;
+
 				case OutputCodes.ExitActionShutdown:
+					server.SetStopStatus();
+					break;
+
 				case OutputCodes.ExitActionSilentShutdown:
+					server.SetStopStatus();
+					break;
+
 				case OutputCodes.ExitActionRestart:
+					server.SetRestartStatus();
 					break;
 
 				default: