From ff7f06dffdda3f20bf12214a715c9adc29251a4c Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 14 Jun 2018 14:11:52 -0400 Subject: [PATCH] Revert " Fix NMZ points overlay appearing in the KBD instance lair" This reverts commit 0285c653817545e30509e3b7c8c568fcbbccd4ca. --- .../plugins/nightmarezone/NightmareZonePlugin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java index a98431f114..7c58f16d95 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.nightmarezone; import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; +import java.util.Arrays; import javax.inject.Inject; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -33,8 +34,6 @@ import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; @@ -47,6 +46,8 @@ import net.runelite.client.util.Text; ) public class NightmareZonePlugin extends Plugin { + private static final int[] NMZ_MAP_REGION = {9033}; + @Inject private Notifier notifier; @@ -174,9 +175,8 @@ public class NightmareZonePlugin extends Plugin } } - boolean isInNightmareZone() + public boolean isInNightmareZone() { - Widget nmz = client.getWidget(WidgetInfo.NIGHTMARE_ZONE); - return nmz != null && !nmz.isSelfHidden(); + return Arrays.equals(client.getMapRegions(), NMZ_MAP_REGION); } }