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 restart publication races (#3186)

Browse source 
Prepare offline routing before restart requests become observable, reject stale route owners, and wait for source-client cleanup before executing automatic retries.

Add deterministic publication-order, cleanup-gate, and stale-route regression tests.
This commit is contained in:
Anon 2026-07-27 17:12:03 +02:00
parent 456a548cbc
commit 5655e3fc89
7 changed files with 164 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
MinecraftClient/Program.cs
View file

@ -1095,11 +1095,15 @@ namespace MinecraftClient
long sourceConnectionAttempt,
TimeSpan delay,
bool keepAccountAndServerSettings = false,
bool replaceUntilCommit = false)
bool replaceUntilCommit = false,
Task? sourceCleanupCompletion = null)
{
if (Volatile.Read(ref exitOnFailurePending) != 0)
return false;
if (sourceConnectionAttempt != CurrentConnectionAttempt)
return false;
if (delay < TimeSpan.Zero)
delay = TimeSpan.Zero;
@ -1107,14 +1111,15 @@ namespace MinecraftClient
? CaptureRestartSettings()
: null;
bool scheduled = restartCoordinator.TrySchedule(new RestartRequest(
sourceConnectionAttempt,
delay,
keepAccountAndServerSettings,
settingsSnapshot,
replaceUntilCommit));
if (scheduled)
BeginOfflinePrompt(sourceConnectionAttempt);
bool scheduled = restartCoordinator.TrySchedule(
new RestartRequest(
sourceConnectionAttempt,
delay,
keepAccountAndServerSettings,
settingsSnapshot,
replaceUntilCommit,
sourceCleanupCompletion),
() => BeginOfflinePrompt(sourceConnectionAttempt));
return scheduled;
}
@ -1265,9 +1270,13 @@ namespace MinecraftClient
}
}
private static void BeginOfflinePrompt(long connectionAttempt)
private static bool BeginOfflinePrompt(long connectionAttempt)
{
offlinePromptRoute.TryActivate(connectionAttempt, () =>
long currentConnectionAttempt = CurrentConnectionAttempt;
if (connectionAttempt != currentConnectionAttempt)
return false;
if (offlinePromptRoute.TryActivate(connectionAttempt, currentConnectionAttempt, () =>
{
ConsoleInputRouter.RouteOffline(HandleOfflineCommand);
ConsoleIO.WriteLine(string.Empty);
@ -1276,7 +1285,12 @@ namespace MinecraftClient
ConsoleIO.WriteLineFormatted(string.Format(Translations.mcc_use_quit_to_exit, Config.Main.Advanced.InternalCmdChar.ToLogString()));
else
ConsoleIO.WriteLineFormatted(Translations.mcc_press_exit, acceptnewlines: true);
});
}))
{
return true;
}
return offlinePromptRoute.OwnerAttempt == connectionAttempt;
}
private static void EndOfflinePrompt()