From: Wen Date: Sat, 29 Mar 2025 13:29:04 +0000 (-0600) Subject: EventHandler Type Renamed to EventHandlerContent in FFXIVClientStructs X-Git-Tag: v5.0~5^2~1 X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=f09f3a30814627fe1dd045bc64cb34db5f430a61;p=Questionable.git EventHandler Type Renamed to EventHandlerContent in FFXIVClientStructs --- diff --git a/Questionable/Controller/GameUi/InteractionUiController.cs b/Questionable/Controller/GameUi/InteractionUiController.cs index 950f7059..43a57fdb 100644 --- a/Questionable/Controller/GameUi/InteractionUiController.cs +++ b/Questionable/Controller/GameUi/InteractionUiController.cs @@ -583,7 +583,7 @@ internal sealed class InteractionUiController : IDisposable var director = UIState.Instance()->DirectorTodo.Director; if (director != null && - director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector && + director->Info.EventId.ContentId == EventHandlerContent.GatheringLeveDirector && director->Sequence == 254) { // just close the dialogue for 'do you want to return to next settlement', should prolly be different for diff --git a/Questionable/Controller/GatheringController.cs b/Questionable/Controller/GatheringController.cs index 28de31f9..8968ee00 100644 --- a/Questionable/Controller/GatheringController.cs +++ b/Questionable/Controller/GatheringController.cs @@ -136,7 +136,7 @@ internal sealed unsafe class GatheringController : MiniTaskControllerDirectorTodo.Director; - if (director != null && director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector) + if (director != null && director->Info.EventId.ContentId == EventHandlerContent.GatheringLeveDirector) { if (director->Sequence == 254) return; diff --git a/Questionable/Controller/Steps/Leves/InitiateLeve.cs b/Questionable/Controller/Steps/Leves/InitiateLeve.cs index 31cf4705..3049a68a 100644 --- a/Questionable/Controller/Steps/Leves/InitiateLeve.cs +++ b/Questionable/Controller/Steps/Leves/InitiateLeve.cs @@ -44,7 +44,7 @@ internal static class InitiateLeve { var director = UIState.Instance()->DirectorTodo.Director; if (director != null && - director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector && + director->Info.EventId.ContentId == EventHandlerContent.GatheringLeveDirector && director->ContentId == Task.ElementId.Value) return ETaskResult.SkipRemainingTasksForStep;