Merge remote-tracking branch 'origin/master' into brigadier-dev

This commit is contained in:
BruceChen 2022-11-07 15:39:46 +08:00
commit 5d2589b10f
185 changed files with 14563 additions and 90684 deletions

View file

@ -922,7 +922,7 @@ namespace MinecraftClient
/// </summary>
/// <param name="ExtraAttempts">In case of failure, maximum extra attempts before aborting</param>
/// <param name="delaySeconds">Optional delay, in seconds, before restarting</param>
protected void ReconnectToTheServer(int ExtraAttempts = 3, int delaySeconds = 0)
protected void ReconnectToTheServer(int ExtraAttempts = 3, int delaySeconds = 0, bool keepAccountAndServerSettings = false)
{
if (Settings.Config.Logging.DebugMessages)
{
@ -930,7 +930,7 @@ namespace MinecraftClient
ConsoleIO.WriteLogLine(string.Format(Translations.chatbot_reconnect, botName));
}
McClient.ReconnectionAttemptsLeft = ExtraAttempts;
Program.Restart(delaySeconds);
Program.Restart(delaySeconds, keepAccountAndServerSettings);
}
/// <summary>