From 0faf994f5467b07df2fead0841d3eb6915e79864 Mon Sep 17 00:00:00 2001 From: TheStonedTurtle Date: Sat, 21 Mar 2020 22:32:46 -0700 Subject: [PATCH] nightmarezone: Fix area check to exclude KBD lair Fixes #3692 --- .../client/plugins/nightmarezone/NightmareZonePlugin.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 4862ea3723..d683ec78a4 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 @@ -243,6 +243,12 @@ public class NightmareZonePlugin extends Plugin public boolean isInNightmareZone() { - return Arrays.equals(client.getMapRegions(), NMZ_MAP_REGION); + if (client.getLocalPlayer() == null) + { + return false; + } + + // NMZ and the KBD lair uses the same region ID but NMZ uses planes 1-3 and KBD uses plane 0 + return client.getLocalPlayer().getWorldLocation().getPlane() > 0 && Arrays.equals(client.getMapRegions(), NMZ_MAP_REGION); } }