Agent/Phantom.Agent.Services/AgentServices.cs

@@ -33,8 +33,6 @@ public sealed class AgentServices {
 		Logger.Information("Stopping services...");
 		
 		await InstanceSessionManager.StopAll();
-		InstanceSessionManager.Dispose();
-		
 		await TaskManager.Stop();
 		
 		Logger.Information("Services stopped.");

Agent/Phantom.Agent.Services/Instances/Instance.cs

@@ -174,10 +174,10 @@ sealed class Instance : IDisposable {
 	}
 
 	public void Dispose() {
-		stateTransitioningActionSemaphore.Dispose();
-		
 		if (currentState is IDisposable disposable) {
 			disposable.Dispose();
 		}
+
+		stateTransitioningActionSemaphore.Dispose();
 	}
 }

Agent/Phantom.Agent.Services/Instances/InstanceSessionManager.cs

@@ -138,24 +138,15 @@ sealed class InstanceSessionManager : IDisposable {
 		await semaphore.WaitAsync(CancellationToken.None);
 		try {
 			await Task.WhenAll(instances.Values.Select(static instance => instance.StopAndWait(TimeSpan.FromSeconds(30))));
-			DisposeAllInstances();
+			instances.Clear();
 		} finally {
 			semaphore.Release();
 		}
 	}
 
 	public void Dispose() {
-		DisposeAllInstances();
 		minecraftServerExecutables.Dispose();
 		shutdownCancellationTokenSource.Dispose();
 		semaphore.Dispose();
 	}
-
-	private void DisposeAllInstances() {
-		foreach (var (_, instance) in instances) {
-			instance.Dispose();
-		}
-
-		instances.Clear();
-	}
 }

Common/Phantom.Common.Data/Instance/InstanceLaunchFailReason.cs

@@ -1,6 +1,6 @@
 namespace Phantom.Common.Data.Instance;
 
-public enum InstanceLaunchFailReason : byte {
+public enum InstanceLaunchFailReason {
 	UnknownError,
 	ServerPortNotAllowed,
 	ServerPortAlreadyInUse,

Common/Phantom.Common.Data/Replies/LaunchInstanceResult.cs

@@ -1,11 +1,11 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum LaunchInstanceResult : byte {
-	UnknownError,
 	LaunchInitiated,
 	InstanceAlreadyLaunching,
 	InstanceAlreadyRunning,
-	InstanceIsStopping
+	InstanceIsStopping,
+	UnknownError
 }
 
 public static class LaunchInstanceResultExtensions {

Common/Phantom.Common.Data/Replies/SendCommandToInstanceResult.cs

@@ -1,8 +1,8 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum SendCommandToInstanceResult : byte {
-	UnknownError,
-	Success
+	Success,
+	UnknownError
 }
 
 public static class SendCommandToInstanceResultExtensions {

Common/Phantom.Common.Data/Replies/StopInstanceResult.cs

@@ -1,10 +1,10 @@
 namespace Phantom.Common.Data.Replies;
 
 public enum StopInstanceResult : byte {
-	UnknownError,
 	StopInitiated,
 	InstanceAlreadyStopping,
-	InstanceAlreadyStopped
+	InstanceAlreadyStopped,
+	UnknownError
 }
 
 public static class StopInstanceResultExtensions {

Server/Phantom.Server.Services/Instances/AddInstanceResult.cs

@@ -1,14 +1,14 @@
 namespace Phantom.Server.Services.Instances;
 
-public enum AddInstanceResult : byte {
-	UnknownError,
+public enum AddInstanceResult {
 	Success,
 	InstanceAlreadyExists,
 	InstanceNameMustNotBeEmpty,
 	InstanceMemoryMustNotBeZero,
 	AgentNotFound,
 	AgentInstanceLimitExceeded,
-	AgentMemoryLimitExceeded
+	AgentMemoryLimitExceeded,
+	UnknownError
 }
 
 public static class AddInstanceResultExtensions {