From 83db1f9dce047b1c1881d0ddf2bf412142f55aad Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 17 Jul 2024 21:42:49 +0200 Subject: [PATCH] Fix wrong command condition --- .../Shared/680_The Company You Keep (Twin Adders).json | 5 +++++ Questionable/Controller/CommandHandler.cs | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/680_The Company You Keep (Twin Adders).json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/680_The Company You Keep (Twin Adders).json index b3411d73f..0b4ee30c6 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/680_The Company You Keep (Twin Adders).json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/680_The Company You Keep (Twin Adders).json @@ -65,6 +65,11 @@ "[Gridania] Lancers' Guild" ] }, + { + "TerritoryId": 152, + "InteractionType": "AttuneAetheryte", + "Aetheryte": "East Shroud - Hawthorne Hut" + }, { "DataId": 1004886, "Position": { diff --git a/Questionable/Controller/CommandHandler.cs b/Questionable/Controller/CommandHandler.cs index e7fa9767f..160310bf3 100644 --- a/Questionable/Controller/CommandHandler.cs +++ b/Questionable/Controller/CommandHandler.cs @@ -101,9 +101,7 @@ internal sealed class CommandHandler : IDisposable if (arguments.Length >= 1 && ushort.TryParse(arguments[0], out ushort questId)) { - if (_gameFunctions.IsQuestLocked(questId, 0)) - _chatGui.PrintError($"[Questionable] Quest {questId} is locked."); - else if (_questRegistry.TryGetQuest(questId, out Quest? quest)) + if (_questRegistry.TryGetQuest(questId, out Quest? quest)) { _debugOverlay.HighlightedQuest = questId; _chatGui.Print($"[Questionable] Set highlighted quest to {questId} ({quest.Info.Name})."); @@ -122,7 +120,9 @@ internal sealed class CommandHandler : IDisposable { if (arguments.Length >= 1 && ushort.TryParse(arguments[0], out ushort questId)) { - if (_questRegistry.TryGetQuest(questId, out Quest? quest)) + if (_gameFunctions.IsQuestLocked(questId, 0)) + _chatGui.PrintError($"[Questionable] Quest {questId} is locked."); + else if (_questRegistry.TryGetQuest(questId, out Quest? quest)) { _questController.SetNextQuest(quest); _chatGui.Print($"[Questionable] Set next quest to {questId} ({quest.Info.Name}).");