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

Improve bot suspend while reconnecting

Browse source 
See #259
This commit is contained in:
ORelio 2017-03-29 21:25:14 +02:00
parent b848460a5c
commit bab472df05
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
MinecraftClient/McTcpClient.cs
View file

@ -26,7 +26,7 @@ namespace MinecraftClient
private readonly Dictionary<Guid, string> onlinePlayers = new Dictionary<Guid, string>(); private readonly Dictionary<Guid, string> onlinePlayers = new Dictionary<Guid, string>();
private readonly List<ChatBot> bots = new List<ChatBot>(); private readonly List<ChatBot> bots = new List<ChatBot>();
private static readonly List<ChatBots.Script> scripts_on_hold = new List<ChatBots.Script>(); private static readonly List<ChatBot> botsOnHold = new List<ChatBot>();
private readonly Dictionary<string, List<ChatBot>> registeredBotPluginChannels = new Dictionary<string, List<ChatBot>>(); private readonly Dictionary<string, List<ChatBot>> registeredBotPluginChannels = new Dictionary<string, List<ChatBot>>();
private readonly List<string> registeredServerPluginChannels = new List<String>(); private readonly List<string> registeredServerPluginChannels = new List<String>();
@ -109,17 +109,20 @@ namespace MinecraftClient
if (!singlecommand) if (!singlecommand)
{ {
if (Settings.AntiAFK_Enabled) { BotLoad(new ChatBots.AntiAFK(Settings.AntiAFK_Delay)); } if (botsOnHold.Count == 0)
if (Settings.Hangman_Enabled) { BotLoad(new ChatBots.HangmanGame(Settings.Hangman_English)); } {
if (Settings.Alerts_Enabled) { BotLoad(new ChatBots.Alerts()); } if (Settings.AntiAFK_Enabled) { BotLoad(new ChatBots.AntiAFK(Settings.AntiAFK_Delay)); }
if (Settings.ChatLog_Enabled) { BotLoad(new ChatBots.ChatLog(Settings.ExpandVars(Settings.ChatLog_File), Settings.ChatLog_Filter, Settings.ChatLog_DateTime)); } if (Settings.Hangman_Enabled) { BotLoad(new ChatBots.HangmanGame(Settings.Hangman_English)); }
if (Settings.PlayerLog_Enabled) { BotLoad(new ChatBots.PlayerListLogger(Settings.PlayerLog_Delay, Settings.ExpandVars(Settings.PlayerLog_File))); } if (Settings.Alerts_Enabled) { BotLoad(new ChatBots.Alerts()); }
if (Settings.AutoRelog_Enabled) { BotLoad(new ChatBots.AutoRelog(Settings.AutoRelog_Delay, Settings.AutoRelog_Retries)); } if (Settings.ChatLog_Enabled) { BotLoad(new ChatBots.ChatLog(Settings.ExpandVars(Settings.ChatLog_File), Settings.ChatLog_Filter, Settings.ChatLog_DateTime)); }
if (Settings.ScriptScheduler_Enabled) { BotLoad(new ChatBots.ScriptScheduler(Settings.ExpandVars(Settings.ScriptScheduler_TasksFile))); } if (Settings.PlayerLog_Enabled) { BotLoad(new ChatBots.PlayerListLogger(Settings.PlayerLog_Delay, Settings.ExpandVars(Settings.PlayerLog_File))); }
if (Settings.RemoteCtrl_Enabled) { BotLoad(new ChatBots.RemoteControl()); } if (Settings.AutoRelog_Enabled) { BotLoad(new ChatBots.AutoRelog(Settings.AutoRelog_Delay, Settings.AutoRelog_Retries)); }
if (Settings.AutoRespond_Enabled) { BotLoad(new ChatBots.AutoRespond(Settings.AutoRespond_Matches)); } if (Settings.ScriptScheduler_Enabled) { BotLoad(new ChatBots.ScriptScheduler(Settings.ExpandVars(Settings.ScriptScheduler_TasksFile))); }
//Add your ChatBot here by uncommenting and adapting if (Settings.RemoteCtrl_Enabled) { BotLoad(new ChatBots.RemoteControl()); }
//BotLoad(new ChatBots.YourBot()); if (Settings.AutoRespond_Enabled) { BotLoad(new ChatBots.AutoRespond(Settings.AutoRespond_Matches)); }
//Add your ChatBot here by uncommenting and adapting
//BotLoad(new ChatBots.YourBot());
}
} }
try try
@ -143,10 +146,9 @@ namespace MinecraftClient
} }
else else
{ {
foreach (ChatBot bot in scripts_on_hold) foreach (ChatBot bot in botsOnHold)
bot.SetHandler(this); BotLoad(bot, false);
bots.AddRange(scripts_on_hold); botsOnHold.Clear();
scripts_on_hold.Clear();
Console.WriteLine("Server was successfully joined.\nType '" Console.WriteLine("Server was successfully joined.\nType '"
+ (Settings.internalCmdChar == ' ' ? "" : "" + Settings.internalCmdChar) + (Settings.internalCmdChar == ' ' ? "" : "" + Settings.internalCmdChar)
@ -310,9 +312,8 @@ namespace MinecraftClient
/// </summary> /// </summary>
public void Disconnect() public void Disconnect()
{ {
foreach (ChatBot bot in bots) botsOnHold.Clear();
if (bot is ChatBots.Script) botsOnHold.AddRange(bots);
scripts_on_hold.Add((ChatBots.Script)bot);
if (handler != null) if (handler != null)
{ {
@ -332,15 +333,14 @@ namespace MinecraftClient
/// <summary> /// <summary>
/// Load a new bot /// Load a new bot
/// </summary> /// </summary>
public void BotLoad(ChatBot b) public void BotLoad(ChatBot b, bool init = true)
{ {
b.SetHandler(this); b.SetHandler(this);
bots.Add(b); bots.Add(b);
b.Initialize(); if (init)
b.Initialize();
if (this.handler != null) if (this.handler != null)
{
b.AfterGameJoined(); b.AfterGameJoined();
}
Settings.SingleCommand = ""; Settings.SingleCommand = "";
} }