Merge pull request #58 from qwqtoday/wait-for-game-not-return-fix

Wait for game not return fix
psu-de · Jun 9, 2024 · 95798fc · 95798fc
2 parents a5c0ee0 + 527c94a
commit 95798fc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/Components/MineSharp.Protocol/Exceptions/DisconnectedException.cs b/Components/MineSharp.Protocol/Exceptions/DisconnectedException.cs
@@ -0,0 +1,10 @@
+namespace MineSharp.Protocol.Exceptions;
+
+/// <inheritdoc />
+public class DisconnectedException(string message, string reason) : MineSharpHostException(message)
+{
+    /// <summary>
+    /// The reason of the disconnect
+    /// </summary>
+    public string Reason { get; private set; } = reason;
+}
diff --git a/Components/MineSharp.Protocol/MinecraftClient.cs b/Components/MineSharp.Protocol/MinecraftClient.cs
@@ -202,6 +202,10 @@ public Task SendPacket(IPacket packet, CancellationToken? cancellation = null)
     public async Task Disconnect(string reason = "disconnect.quitting")
     {
         Logger.Info($"Disconnecting: {reason}");
+
+        if (!_gameJoinedTsc.Task.IsCompleted)
+            _gameJoinedTsc.SetException(new DisconnectedException($"Client has been disconnected", reason));
+
         if (this._client is null)
             throw new InvalidOperationException("MinecraftClient is not connected.");