From 7744056766e09aee1157a2014eb5d5092155a898 Mon Sep 17 00:00:00 2001 From: TheStonedTurtle Date: Thu, 26 Mar 2020 21:07:08 -0700 Subject: [PATCH] discord: Fix NMZ area check to exclude KBD lair NMZ reuses the KBD region ID but is always above plane 0 --- .../runelite/client/plugins/discord/DiscordPlugin.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index 513ce7bff7..0c17f75a26 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -381,7 +381,15 @@ public class DiscordPlugin extends Plugin return; } - final DiscordGameEventType discordGameEventType = DiscordGameEventType.fromRegion(playerRegionID); + DiscordGameEventType discordGameEventType = DiscordGameEventType.fromRegion(playerRegionID); + + // NMZ uses the same region ID as KBD. KBD is always on plane 0 and NMZ is always above plane 0 + // Since KBD requires going through the wilderness there is no EventType for it + if (DiscordGameEventType.MG_NIGHTMARE_ZONE == discordGameEventType + && client.getLocalPlayer().getWorldLocation().getPlane() == 0) + { + discordGameEventType = null; + } if (discordGameEventType == null) {