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

Merge pull request #3072 from milutinke/bugfix/srv-resolution

Browse source
This commit is contained in:
Anon 2026-04-08 18:15:22 +02:00 • committed by GitHub
commit d96396f74d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

62
MinecraftClient/McClient.cs
View file

@ -229,6 +229,8 @@ namespace MinecraftClient
CancellationTokenSource? cmdprompt = null;
Tuple<Thread, CancellationTokenSource>? timeoutdetector = null;
private int transferInProgress = 0;
private bool consoleReadThreadOwned = false;
private bool consoleHandlersAttached = false;
public ILogger Log;
@ -328,10 +330,7 @@ namespace MinecraftClient
Log.Info(string.Format(Translations.mcc_joined, Config.Main.Advanced.InternalCmdChar.ToLogString()));
cmdprompt = new CancellationTokenSource();
ConsoleIO.Backend.BeginReadThread();
ConsoleIO.Backend.MessageReceived += ConsoleReaderOnMessageReceived;
ConsoleIO.Backend.OnInputChange += ConsoleIO.AutocompleteHandler;
StartConsoleSession();
}
else
{
@ -373,9 +372,7 @@ namespace MinecraftClient
}
else if (InternalConfig.InteractiveMode)
{
ConsoleIO.Backend.StopReadThread();
ConsoleIO.Backend.MessageReceived -= ConsoleReaderOnMessageReceived;
ConsoleIO.Backend.OnInputChange -= ConsoleIO.AutocompleteHandler;
StopConsoleSession();
Program.HandleFailure();
}
@ -393,9 +390,7 @@ namespace MinecraftClient
// kick messages and Ignore_Kick_Message is false, or retry limit reached)
if (InternalConfig.InteractiveMode)
{
ConsoleIO.Backend.StopReadThread();
ConsoleIO.Backend.MessageReceived -= ConsoleReaderOnMessageReceived;
ConsoleIO.Backend.OnInputChange -= ConsoleIO.AutocompleteHandler;
StopConsoleSession();
Program.HandleFailure();
}
@ -456,10 +451,7 @@ namespace MinecraftClient
UpdateKeepAlive();
Log.Info($"Successfully transferred connection and logged in to {resolvedHost}:{resolvedPort}.");
cmdprompt = new CancellationTokenSource();
ConsoleIO.Backend.BeginReadThread();
ConsoleIO.Backend.MessageReceived += ConsoleReaderOnMessageReceived;
ConsoleIO.Backend.OnInputChange += ConsoleIO.AutocompleteHandler;
StartConsoleSession();
}
else
{
@ -503,9 +495,7 @@ namespace MinecraftClient
}
else if (InternalConfig.InteractiveMode)
{
ConsoleIO.Backend.StopReadThread();
ConsoleIO.Backend.MessageReceived -= ConsoleReaderOnMessageReceived;
ConsoleIO.Backend.OnInputChange -= ConsoleIO.AutocompleteHandler;
StopConsoleSession();
Program.HandleFailure();
}
@ -531,6 +521,40 @@ namespace MinecraftClient
port = resolvedPort;
}
private void StartConsoleSession()
{
cmdprompt = new CancellationTokenSource();
if (!consoleReadThreadOwned)
{
ConsoleIO.Backend.BeginReadThread();
consoleReadThreadOwned = true;
}
if (!consoleHandlersAttached)
{
ConsoleIO.Backend.MessageReceived += ConsoleReaderOnMessageReceived;
ConsoleIO.Backend.OnInputChange += ConsoleIO.AutocompleteHandler;
consoleHandlersAttached = true;
}
}
private void StopConsoleSession()
{
if (consoleHandlersAttached)
{
ConsoleIO.Backend.MessageReceived -= ConsoleReaderOnMessageReceived;
ConsoleIO.Backend.OnInputChange -= ConsoleIO.AutocompleteHandler;
consoleHandlersAttached = false;
}
if (consoleReadThreadOwned)
{
ConsoleIO.Backend.StopReadThread();
consoleReadThreadOwned = false;
}
}
private void ResetStateForTransfer()
{
ClearTasks();
@ -893,9 +917,7 @@ namespace MinecraftClient
if (!will_restart)
{
ConsoleIO.Backend.StopReadThread();
ConsoleIO.Backend.MessageReceived -= ConsoleReaderOnMessageReceived;
ConsoleIO.Backend.OnInputChange -= ConsoleIO.AutocompleteHandler;
StopConsoleSession();
Program.HandleFailure(null, false, reason);
}
}