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(); 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() @@ -70,6 +69,7 @@ internal static class UseItem ]; } + var unmount = serviceProvider.GetRequiredService(); if (step.GroundTarget == true) { ITask task;