From fb85e2a9912575712aa80819005ab5ae444c63f3 Mon Sep 17 00:00:00 2001 From: raaaaaven <168305416+raaaaaven@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:34:25 +0100 Subject: Improvement: Hoppity Menu Shortcut appearing in islands that it's not supposed to be used in. (#1585) Co-authored-by: raven --- .../features/event/chocolatefactory/ChocolateFactoryShortcut.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features') diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryShortcut.kt b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryShortcut.kt index b28acd995..edb6af40e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryShortcut.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryShortcut.kt @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.features.event.chocolatefactory +import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent -import at.hannibal2.skyhanni.features.rift.RiftAPI import at.hannibal2.skyhanni.utils.HypixelCommands import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName @@ -36,8 +36,8 @@ class ChocolateFactoryShortcut { @SubscribeEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { - if (RiftAPI.inRift()) return if (!LorenzUtils.inSkyBlock) return + if (LorenzUtils.inAnyIsland(IslandType.THE_RIFT, IslandType.KUUDRA_ARENA, IslandType.CATACOMBS, IslandType.MINESHAFT)) return showItem = config.hoppityMenuShortcut && event.inventoryName == "SkyBlock Menu" } -- cgit