Fixes #418

ObsidianMC · Jan 21, 2024 · 0003f95 · 0003f95
1 parent e08e0ea
commit 0003f95
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/Obsidian/Server.cs b/Obsidian/Server.cs
@@ -67,6 +67,7 @@ public static string VERSION
     private readonly ILogger _logger;
 
     private IConnectionListener? _tcpListener;
+    private bool _isFullyInitialized;
 
     public ProtocolVersion Protocol => DefaultProtocol;
 
@@ -289,6 +290,7 @@ public async Task RunAsync()
             continue;
 
         _logger.LogInformation("Listening for new clients...");
+        _isFullyInitialized = true;
 
         try
         {
@@ -331,8 +333,17 @@ private async Task AcceptClientsAsync()
                     // No longer accepting clients.
                     break;
                 }
-
                 connection = acceptedConnection;
+
+                if (!_isFullyInitialized)
+                {
+                    connection.Abort();
+                    await connection.DisposeAsync();
+
+                    _logger.LogDebug("Server has not been fully initialized. Aborted the connection");
+                    continue;
+                }
+
             }
             catch (OperationCanceledException)
             {