anna
/
Macrology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: don't do macro stuff when logged out

This commit is contained in:
Anna 2020-08-19 04:06:58 -04:00
parent 7843ac1360
commit 2b4e25bf9f
Signed by: anna
GPG Key ID: 0B391D8F06FCD9E0
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Custom Commands and Macro Macros/CCMMPlugin.cs
View File

@ -28,6 +28,8 @@ namespace CCMM {
this.Interface.UiBuilder.OnBuildUi += this.Ui.Draw;
this.Interface.UiBuilder.OnOpenConfigUi += this.Ui.OpenSettings;
this.Interface.Framework.OnUpdateEvent += this.MacroHandler.OnFrameworkUpdate;
this.Interface.ClientState.OnLogin += this.MacroHandler.OnLogin;
this.Interface.ClientState.OnLogout += this.MacroHandler.OnLogout;
foreach (KeyValuePair<string, string> entry in Commands.COMMANDS) {
this.Interface.CommandManager.AddHandler(entry.Key, new CommandInfo(this.Commands.OnCommand) {
HelpMessage = entry.Value,
@ -41,6 +43,8 @@ namespace CCMM {
this.Interface.UiBuilder.OnBuildUi -= this.Ui.Draw;
this.Interface.UiBuilder.OnOpenConfigUi -= this.Ui.OpenSettings;
this.Interface.Framework.OnUpdateEvent -= this.MacroHandler.OnFrameworkUpdate;
this.Interface.ClientState.OnLogin -= this.MacroHandler.OnLogin;
this.Interface.ClientState.OnLogout -= this.MacroHandler.OnLogout;
foreach (string command in Commands.COMMANDS.Keys) {
this.Interface.CommandManager.RemoveHandler(command);
}

25
Custom Commands and Macro Macros/MacroHandler.cs
View File

@ -9,6 +9,7 @@ using System.Threading.Tasks;
namespace CCMM {
public class MacroHandler {
private bool ready = false;
private readonly static Regex WAIT = new Regex(@"<wait\.(\d+(?:\.\d+)?)>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private readonly CCMMPlugin plugin;
@ -19,6 +20,7 @@ namespace CCMM {
public MacroHandler(CCMMPlugin plugin) {
this.plugin = plugin ?? throw new ArgumentNullException(nameof(plugin), "CCMMPlugin cannot be null");
this.ready = this.plugin.Interface.ClientState.LocalPlayer != null;
}
private static string[] ExtractCommands(string macro) {
@ -28,6 +30,10 @@ namespace CCMM {
}
public Guid SpawnMacro(Macro macro) {
if (!this.ready) {
return Guid.Empty;
}
string[] commands = ExtractCommands(macro.Contents);
Guid id = Guid.NewGuid();
if (commands.Length == 0) {
@ -87,9 +93,14 @@ namespace CCMM {
return paused;
}
public bool IsCancelled(Guid id) {
this.cancelled.TryGetValue(id, out bool cancelled);
return cancelled;
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "delegate")]
public void OnFrameworkUpdate(Framework framework) {
if (!this.commands.Reader.TryRead(out string command)) {
if (!this.commands.Reader.TryRead(out string command) || !this.ready) {
return;
}
@ -112,5 +123,17 @@ namespace CCMM {
return null;
}
internal void OnLogin(object sender, EventArgs args) {
this.ready = true;
}
internal void OnLogout(object sender, EventArgs args) {
this.ready = false;
foreach (Guid id in this.Running.Keys) {
this.CancelMacro(id);
}
}
}
}