helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Process command prompt text on main thread (#1510)

Browse source 
Fix possible threading issues when MCC commands interactively
This commit is contained in:
ORelio 2021-03-27 19:15:58 +01:00
parent 47c19466c3
commit 70d3b6175b
1 changed files with 60 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

100
MinecraftClient/McClient.cs
View file

@ -26,7 +26,9 @@ namespace MinecraftClient
private static readonly List<string> cmd_names = new List<string>(); private static readonly List<string> cmd_names = new List<string>();
private static readonly Dictionary<string, Command> cmds = new Dictionary<string, Command>(); private static readonly Dictionary<string, Command> cmds = new Dictionary<string, Command>();
private readonly Dictionary<Guid, string> onlinePlayers = new Dictionary<Guid, string>(); private readonly Dictionary<Guid, string> onlinePlayers = new Dictionary<Guid, string>();
private static bool CommandLoaded = false;
private static bool commandsLoaded = false;
private Queue<string> commandQueue = new Queue<string>();
private Queue<string> chatQueue = new Queue<string>(); private Queue<string> chatQueue = new Queue<string>();
private static DateTime nextMessageSendTime = DateTime.MinValue; private static DateTime nextMessageSendTime = DateTime.MinValue;
@ -289,58 +291,68 @@ namespace MinecraftClient
} }
/// <summary> /// <summary>
/// Allows the user to send chat messages, commands, and to leave the server. /// Allows the user to send chat messages, commands, and leave the server.
/// Enqueue text typed in the command prompt for processing on the main thread.
/// </summary> /// </summary>
private void CommandPrompt() private void CommandPrompt()
{ {
try try
{ {
string text = "";
Thread.Sleep(500); Thread.Sleep(500);
handler.SendRespawnPacket();
while (client.Client.Connected) while (client.Client.Connected)
{ {
text = ConsoleIO.ReadLine(); string text = ConsoleIO.ReadLine();
if (ConsoleIO.BasicIO && text.Length > 0 && text[0] == (char)0x00) lock (commandQueue)
{ {
//Process a request from the GUI commandQueue.Enqueue(text);
string[] command = text.Substring(1).Split((char)0x00);
switch (command[0].ToLower())
{
case "autocomplete":
if (command.Length > 1) { ConsoleIO.WriteLine((char)0x00 + "autocomplete" + (char)0x00 + handler.AutoComplete(command[1])); }
else Console.WriteLine((char)0x00 + "autocomplete" + (char)0x00);
break;
}
} }
else }
{
text = text.Trim();
if (text.Length > 0)
{
if (Settings.internalCmdChar == ' ' || text[0] == Settings.internalCmdChar)
{
string response_msg = "";
string command = Settings.internalCmdChar == ' ' ? text : text.Substring(1);
if (!PerformInternalCommand(Settings.ExpandVars(command), ref response_msg) && Settings.internalCmdChar == '/')
{
SendText(text);
}
else if (response_msg.Length > 0)
{
Log.Info(response_msg);
}
}
else SendText(text);
}
}
}
} }
catch (IOException) { } catch (IOException) { }
catch (NullReferenceException) { } catch (NullReferenceException) { }
} }
/// <summary>
/// Allows the user to send chat messages, commands, and leave the server.
/// Process text from the MCC command prompt on the main thread.
/// </summary>
private void HandleCommandPromptText(string text)
{
if (ConsoleIO.BasicIO && text.Length > 0 && text[0] == (char)0x00)
{
//Process a request from the GUI
string[] command = text.Substring(1).Split((char)0x00);
switch (command[0].ToLower())
{
case "autocomplete":
if (command.Length > 1) { ConsoleIO.WriteLine((char)0x00 + "autocomplete" + (char)0x00 + handler.AutoComplete(command[1])); }
else Console.WriteLine((char)0x00 + "autocomplete" + (char)0x00);
break;
}
}
else
{
text = text.Trim();
if (text.Length > 0)
{
if (Settings.internalCmdChar == ' ' || text[0] == Settings.internalCmdChar)
{
string response_msg = "";
string command = Settings.internalCmdChar == ' ' ? text : text.Substring(1);
if (!PerformInternalCommand(Settings.ExpandVars(command), ref response_msg) && Settings.internalCmdChar == '/')
{
SendText(text);
}
else if (response_msg.Length > 0)
{
Log.Info(response_msg);
}
}
else SendText(text);
}
}
}
/// <summary> /// <summary>
/// Periodically checks for server keepalives and consider that connection has been lost if the last received keepalive is too old. /// Periodically checks for server keepalives and consider that connection has been lost if the last received keepalive is too old.
/// </summary> /// </summary>
@ -426,7 +438,7 @@ namespace MinecraftClient
{ {
/* Load commands from the 'Commands' namespace */ /* Load commands from the 'Commands' namespace */
if (!CommandLoaded) if (!commandsLoaded)
{ {
Type[] cmds_classes = Program.GetTypesInNamespace("MinecraftClient.Commands"); Type[] cmds_classes = Program.GetTypesInNamespace("MinecraftClient.Commands");
foreach (Type type in cmds_classes) foreach (Type type in cmds_classes)
@ -447,7 +459,7 @@ namespace MinecraftClient
} }
} }
} }
CommandLoaded = true; commandsLoaded = true;
} }
} }
@ -560,6 +572,14 @@ namespace MinecraftClient
} }
} }
lock (commandQueue)
{
if (commandQueue.Count > 0)
{
HandleCommandPromptText(commandQueue.Dequeue());
}
}
lock (chatQueue) lock (chatQueue)
{ {
if (chatQueue.Count > 0 && nextMessageSendTime < DateTime.Now) if (chatQueue.Count > 0 && nextMessageSendTime < DateTime.Now)