cacahuetes/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

master #3

Open
cacahuetes wants to merge 673 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 673 Files Changed 1519 +4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1bc17832bb - Show all commits

4
Questionable/Controller/Steps/Shared/AetheryteShortcut.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Questionable.Controller.Steps.Common; using Questionable.Controller.Steps.Common;
@ -56,6 +57,7 @@ internal static class AetheryteShortcut
QuestFunctions questFunctions, QuestFunctions questFunctions,
IClientState clientState, IClientState clientState,
IChatGui chatGui, IChatGui chatGui,
ICondition condition,
AetheryteData aetheryteData) : TaskExecutor<Task> AetheryteData aetheryteData) : TaskExecutor<Task>
{ {
private bool _teleported; private bool _teleported;
@ -217,6 +219,8 @@ internal static class AetheryteShortcut
throw new TaskException("Unable to teleport to aetheryte"); throw new TaskException("Unable to teleport to aetheryte");
} }
} }
public override bool WasInterrupted() => condition[ConditionFlag.InCombat] || base.WasInterrupted();
} }
internal sealed record MoveAwayFromAetheryte(EAetheryteLocation TargetAetheryte) : ITask internal sealed record MoveAwayFromAetheryte(EAetheryteLocation TargetAetheryte) : ITask