From 73c6aae1e2c968e045305c51458a23341a30d980 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Sat, 13 Jul 2024 13:47:15 +0200
Subject: [PATCH] Fix for potentially getting stuck during accepting quests

---
 .../MSQ/I-5.3/3782_Reflections in Crystal.json           | 9 +++++++++
 .../MSQ/J-5.4/4016_Futures Rewritten.json                | 2 +-
 .../MSQ/K-5.5/4063_When the Dust Settles.json            | 1 +
 Questionable/Controller/QuestController.cs               | 7 ++++---
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3782_Reflections in Crystal.json b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3782_Reflections in Crystal.json
index d228498b..63c911a9 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3782_Reflections in Crystal.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3782_Reflections in Crystal.json	
@@ -60,6 +60,15 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": 0.1512314,
+            "Y": 1.9999986,
+            "Z": 19.4396
+          },
+          "TerritoryId": 351,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1033896,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4016_Futures Rewritten.json b/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4016_Futures Rewritten.json
index 7126df0e..c5a3650d 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4016_Futures Rewritten.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4016_Futures Rewritten.json	
@@ -12,7 +12,7 @@
             "Y": 64.45569,
             "Z": -242.66425
           },
-          "StopDistance": 5,
+          "StopDistance": 7,
           "TerritoryId": 180,
           "InteractionType": "AcceptQuest"
         }
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4063_When the Dust Settles.json b/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4063_When the Dust Settles.json
index 3dafb4ad..3a048dd0 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4063_When the Dust Settles.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4063_When the Dust Settles.json	
@@ -12,6 +12,7 @@
             "Y": 83.2,
             "Z": 15.121643
           },
+          "StopDistance": 5,
           "TerritoryId": 130,
           "InteractionType": "AcceptQuest"
         }
diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs
index 00ba0a5e..de00083c 100644
--- a/Questionable/Controller/QuestController.cs
+++ b/Questionable/Controller/QuestController.cs
@@ -112,9 +112,10 @@ internal sealed class QuestController
         if (CurrentQuest != null && CurrentQuest.Quest.Root.TerritoryBlacklist.Contains(_clientState.TerritoryType))
             return;
 
-        if (_automatic && _currentTask == null && _taskQueue.Count == 0
-            && CurrentQuest is { Sequence: 0, Step: 0 } or { Sequence: 0, Step: 255 }
-            && DateTime.Now >= CurrentQuest.StepProgress.StartedAt.AddSeconds(15))
+        if (_automatic && ((_currentTask == null && _taskQueue.Count == 0) ||
+                           _currentTask is WaitAtEnd.WaitQuestAccepted)
+                       && CurrentQuest is { Sequence: 0, Step: 0 } or { Sequence: 0, Step: 255 }
+                       && DateTime.Now >= CurrentQuest.StepProgress.StartedAt.AddSeconds(15))
         {
             lock (_lock)
             {