helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: exit on failure instead of prompting

Browse source
This commit is contained in:
Anon 2026-07-17 19:16:00 +02:00
parent 419c140dc4
commit 25bbe35718
4 changed files with 250 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

58
MinecraftClient/Program.cs
View file

@ -56,6 +56,7 @@ namespace MinecraftClient
private static bool useMcVersionOnce = false;
private static Thread? _restartThread = null;
private static readonly object _restartLock = new();
private static int exitOnFailurePending;
private static string settingsIniPath = "MinecraftClient.ini";
// [SENTRY]
@ -916,6 +917,9 @@ namespace MinecraftClient
{
lock (_restartLock)
{
if (Volatile.Read(ref exitOnFailurePending) != 0)
return false;
if (HasRestartPendingForAnotherThreadNoLock())
return false;
@ -962,6 +966,19 @@ namespace MinecraftClient
&& _restartThread != Thread.CurrentThread;
}
/// <summary>
/// Marks the current failure as terminal when MCC is running under an external supervisor.
/// Further restart requests are rejected so disconnect cleanup cannot revive the process.
/// </summary>
internal static bool PrepareExitOnFailure()
{
if (InternalConfig.InteractiveMode)
return false;
Interlocked.Exchange(ref exitOnFailurePending, 1);
return true;
}
public static void DoExit(int exitcode = 0)
{
WriteBackSettings();
@ -1015,13 +1032,19 @@ namespace MinecraftClient
catch { }
}
ConsoleIO.WriteLine(errorMessage);
}
if (disconnectReason.HasValue)
{
autoRelogHandled = true;
if (ChatBots.AutoRelog.OnDisconnectStatic(disconnectReason.Value, errorMessage))
return;
}
if (PrepareExitOnFailure())
{
Exit(GetFailureExitCode(disconnectReason));
return;
}
if (!string.IsNullOrEmpty(errorMessage) && disconnectReason.HasValue)
{
autoRelogHandled = true;
if (ChatBots.AutoRelog.OnDisconnectStatic(disconnectReason.Value, errorMessage))
return;
}
if (InternalConfig.InteractiveMode)
@ -1123,20 +1146,17 @@ namespace MinecraftClient
offlinePrompt.Item1.Start();
}
}
else
{
// Not in interactive mode, just exit and let the calling script handle the failure
if (disconnectReason.HasValue)
{
// Return distinct exit codes for known failures.
if (disconnectReason.Value == ChatBot.DisconnectReason.UserLogout) Exit(1);
if (disconnectReason.Value == ChatBot.DisconnectReason.InGameKick) Exit(2);
if (disconnectReason.Value == ChatBot.DisconnectReason.ConnectionLost) Exit(3);
if (disconnectReason.Value == ChatBot.DisconnectReason.LoginRejected) Exit(4);
}
Exit();
}
}
private static int GetFailureExitCode(ChatBot.DisconnectReason? disconnectReason)
{
return disconnectReason switch
{
ChatBot.DisconnectReason.InGameKick => 2,
ChatBot.DisconnectReason.ConnectionLost => 3,
ChatBot.DisconnectReason.LoginRejected => 4,
_ => 1,
};
}
/// <summary>