Skip to content

adjusted AutoRetainer and GC turnin stop procedures #940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2025
Merged

adjusted AutoRetainer and GC turnin stop procedures #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AutoDuty/AutoDuty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ private void GetJobAndLevelingCheck()

private void CheckRetainerWindow()
{
if (AutoRetainerHelper.State == ActionState.Running || AMHelper.State == ActionState.Running || AutoRetainer_IPCSubscriber.IsBusy() || AM_IPCSubscriber.IsRunning() || Stage == Stage.Paused)
if (AutoRetainerHelper.State == ActionState.Running || AutoRetainer_IPCSubscriber.IsBusy() || AM_IPCSubscriber.IsRunning() || Stage == Stage.Paused)
return;

if (Svc.Condition[ConditionFlag.OccupiedSummoningBell])
Expand Down
114 changes: 0 additions & 114 deletions AutoDuty/Helpers/AMHelper.cs
View file
Open in desktop

This file was deleted.

9 changes: 7 additions & 2 deletions AutoDuty/Helpers/AutoRetainerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,17 @@ internal override void Stop()
protected override unsafe void HelperStopUpdate(IFramework framework)
{
if (!Svc.Condition[ConditionFlag.OccupiedSummoningBell])
{
base.HelperStopUpdate(framework);
else if (Svc.Targets.Target != null)
Svc.Targets.Target = null;
}
else
{
if (Svc.Targets.Target != null)
Svc.Targets.Target = null;
this.CloseAddons();
}
}


protected override unsafe void HelperUpdate(IFramework framework)
{
Expand Down
8 changes: 6 additions & 2 deletions AutoDuty/Helpers/GCTurninHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,15 @@ internal override void Stop()
protected override unsafe void HelperStopUpdate(IFramework framework)
{
if (!Svc.Condition[Dalamud.Game.ClientState.Conditions.ConditionFlag.OccupiedInQuestEvent])
{
base.HelperStopUpdate(framework);
else if (Svc.Targets.Target != null)
Svc.Targets.Target = null;
}
else
{
if (Svc.Targets.Target != null)
Svc.Targets.Target = null;
this.CloseAddons();
}
}

protected override unsafe void HelperUpdate(IFramework framework)
Expand Down
4 changes: 1 addition & 3 deletions AutoDuty/Windows/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

namespace AutoDuty.Windows;

using System.Numerics;
using System.Text.Json.Serialization;
using Dalamud.Utility.Numerics;
using Data;
using ECommons.ExcelServices;
Expand All @@ -33,7 +31,7 @@ namespace AutoDuty.Windows;
using ECommons.UIHelpers.AtkReaderImplementations;
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using FFXIVClientStructs.FFXIV.Component.GUI;
using ImPlotNET;
using ReflectionHelper = Helpers.ReflectionHelper;

[Serializable]
public class Configuration : IPluginConfiguration
Expand Down