diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 57b782f5e7..3cbf489c59 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -121,6 +121,7 @@ public class TimersPlugin extends Plugin static final int FIGHT_CAVES_REGION_ID = 9551; static final int INFERNO_REGION_ID = 9043; + private static final int NMZ_MAP_REGION_ID = 9033; private static final Pattern TZHAAR_WAVE_MESSAGE = Pattern.compile("Wave: (\\d+)"); private static final String TZHAAR_DEFEATED_MESSAGE = "You have been defeated!"; private static final Pattern TZHAAR_COMPLETE_MESSAGE = Pattern.compile("Your (TzTok-Jad|TzKal-Zuk) kill count is:"); @@ -718,6 +719,11 @@ public class TimersPlugin extends Plugin return client.getMapRegions() != null && ArrayUtils.contains(client.getMapRegions(), INFERNO_REGION_ID); } + private boolean isInNightmareZone() + { + return client.getLocalPlayer() != null && client.getLocalPlayer().getWorldLocation().getPlane() > 0 && ArrayUtils.contains(client.getMapRegions(), NMZ_MAP_REGION_ID); + } + private void createTzhaarTimer() { removeTzhaarTimer(); @@ -783,6 +789,11 @@ public class TimersPlugin extends Plugin switch (gameStateChanged.getGameState()) { case LOADING: + if (!isInNightmareZone()) + { + removeGameTimer(OVERLOAD); + } + if (tzhaarTimer != null && !isInFightCaves() && !isInInferno()) { removeTzhaarTimer();