From eb97c600654e9ec45295d20c67e77051b50f1880 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Sun, 11 Aug 2024 02:14:07 +0200
Subject: [PATCH] Don't unmount when using vesper bay aetheryte tickets

---
 Questionable/Controller/Steps/Interactions/UseItem.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Questionable/Controller/Steps/Interactions/UseItem.cs b/Questionable/Controller/Steps/Interactions/UseItem.cs
index bc6fc8a1..d32bb0a4 100644
--- a/Questionable/Controller/Steps/Interactions/UseItem.cs
+++ b/Questionable/Controller/Steps/Interactions/UseItem.cs
@@ -39,7 +39,6 @@ internal static class UseItem
 
             ArgumentNullException.ThrowIfNull(step.ItemId);
 
-            var unmount = serviceProvider.GetRequiredService<UnmountTask>();
             if (step.ItemId == VesperBayAetheryteTicket)
             {
                 unsafe
@@ -53,11 +52,11 @@ internal static class UseItem
                     .With(quest.Id, step.ItemId.Value, step.CompletionQuestVariablesFlags);
 
                 int currentStepIndex = sequence.Steps.IndexOf(step);
-                QuestStep? nextStep = sequence.Steps.Skip(currentStepIndex + 1).SingleOrDefault();
+                QuestStep? nextStep = sequence.Steps.Skip(currentStepIndex + 1).FirstOrDefault();
                 Vector3? nextPosition = (nextStep ?? step).Position;
                 return
                 [
-                    unmount, task,
+                    task,
                     new WaitConditionTask(() => clientState.TerritoryType == 140,
                         $"Wait(territory: {territoryData.GetNameAndId(140)})"),
                     serviceProvider.GetRequiredService<MountTask>()
@@ -70,6 +69,7 @@ internal static class UseItem
                 ];
             }
 
+            var unmount = serviceProvider.GetRequiredService<UnmountTask>();
             if (step.GroundTarget == true)
             {
                 ITask task;