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

Implement schedule main thread task with return value (#1579)

Browse source 
* Implement schedule main thread task with return value

* Revert change of TestBot.cs
This commit is contained in:
ReinforceZwei 2021-05-12 12:20:13 +08:00 • committed by GitHub
parent 073458f5f2
commit f848495243
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 88 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

21
MinecraftClient/McClient.cs
View file

@ -32,7 +32,7 @@ namespace MinecraftClient
private Queue<string> chatQueue = new Queue<string>();
private static DateTime nextMessageSendTime = DateTime.MinValue;
private Action threadTasks;
private Queue<TaskWithResult> threadTasks = new Queue<TaskWithResult>();
private object threadTasksLock = new object();
private readonly List<ChatBot> bots = new List<ChatBot>();
@ -312,7 +312,7 @@ namespace MinecraftClient
while (client.Client.Connected)
{
string text = ConsoleIO.ReadLine();
ScheduleTask(delegate () { HandleCommandPromptText(text); });
ScheduleTask(new Action(() => { HandleCommandPromptText(text); }));
}
}
catch (IOException) { }
@ -641,12 +641,14 @@ namespace MinecraftClient
SendRespawnPacket();
}
if (threadTasks != null)
lock (threadTasksLock)
{
lock (threadTasksLock)
while (threadTasks.Count > 0)
{
threadTasks();
threadTasks = null;
var taskToRun = threadTasks.Dequeue();
taskToRun.Execute();
taskToRun.Release();
}
}
}
@ -697,12 +699,15 @@ namespace MinecraftClient
/// Schedule a task to run on the main thread
/// </summary>
/// <param name="task">Task to run</param>
public void ScheduleTask(Action task)
public object ScheduleTask(Delegate task)
{
var taskAndResult = new TaskWithResult(task);
lock (threadTasksLock)
{
threadTasks += task;
threadTasks.Enqueue(taskAndResult);
}
taskAndResult.Block();
return taskAndResult.Result;
}
#region Management: Load/Unload ChatBots and Enable/Disable settings