master #2

Merged
cacahuetes merged 79 commits from liza/Questionable:master into master 2024-08-25 10:51:08 +00:00
Showing only changes of commit 325860ec27 - Show all commits

View File

@ -24,13 +24,8 @@ internal sealed class HelpUiController : IDisposable
_addonLifecycle.RegisterListener(AddonEvent.PostSetup, "MultipleHelpWindow", MultipleHelpWindowPostSetup); _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "MultipleHelpWindow", MultipleHelpWindowPostSetup);
} }
private bool ShouldHandleUiInteractions => _questController.IsRunning;
private unsafe void UnendingCodexPostSetup(AddonEvent type, AddonArgs args) private unsafe void UnendingCodexPostSetup(AddonEvent type, AddonArgs args)
{ {
if (!ShouldHandleUiInteractions)
return;
if (_questController.StartedQuest?.Quest.Id.Value == 4526) if (_questController.StartedQuest?.Quest.Id.Value == 4526)
{ {
_logger.LogInformation("Closing Unending Codex"); _logger.LogInformation("Closing Unending Codex");
@ -41,9 +36,6 @@ internal sealed class HelpUiController : IDisposable
private unsafe void ContentsTutorialPostSetup(AddonEvent type, AddonArgs args) private unsafe void ContentsTutorialPostSetup(AddonEvent type, AddonArgs args)
{ {
if (!ShouldHandleUiInteractions)
return;
if (_questController.StartedQuest?.Quest.Id.Value == 245) if (_questController.StartedQuest?.Quest.Id.Value == 245)
{ {
_logger.LogInformation("Closing ContentsTutorial"); _logger.LogInformation("Closing ContentsTutorial");
@ -57,9 +49,6 @@ internal sealed class HelpUiController : IDisposable
/// </summary> /// </summary>
private unsafe void MultipleHelpWindowPostSetup(AddonEvent type, AddonArgs args) private unsafe void MultipleHelpWindowPostSetup(AddonEvent type, AddonArgs args)
{ {
if (!ShouldHandleUiInteractions)
return;
if (_questController.StartedQuest?.Quest.Id.Value == 245) if (_questController.StartedQuest?.Quest.Id.Value == 245)
{ {
_logger.LogInformation("Closing MultipleHelpWindow"); _logger.LogInformation("Closing MultipleHelpWindow");