From 24c8b1bfc75ec35941ea8fb82e5d996fd773e4a3 Mon Sep 17 00:00:00 2001 From: Frutescens Date: Fri, 2 Aug 2024 19:56:08 -0700 Subject: [PATCH] Merging menu-ui-handler.ts --- src/ui/menu-ui-handler.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts index d88e0cc1e33..55f26bc8aa5 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/menu-ui-handler.ts @@ -306,15 +306,11 @@ export default class MenuUiHandler extends MessageUiHandler { if (button === Button.ACTION) { let adjustedCursor = this.cursor; - const excludedMenu = this.excludedMenus().find(e => e.condition); - if (excludedMenu !== undefined && excludedMenu.options !== undefined && excludedMenu.options.length > 0) { - const sortedOptions = excludedMenu.options.sort(); - for (const imo of sortedOptions) { - if (adjustedCursor >= imo) { - adjustedCursor++; - } else { - break; - } + for (const imo of this.ignoredMenuOptions) { + if (adjustedCursor >= imo) { + adjustedCursor++; + } else { + break; } } switch (adjustedCursor) {