From 6bca1d39a986900eeb48a387bc5047d8cba7edd5 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 16 Jul 2018 19:23:42 -0400 Subject: [PATCH] Remove MAZE_GUARDIAN_MOVING npc id This isn't a real npcid and was erroneously added in b7b8fc85fb2a51594e24ad6d7272faee48d05155 --- runelite-api/src/main/java/net/runelite/api/NpcID.java | 1 - .../client/plugins/mta/telekinetic/TelekineticRoom.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 7085ac9fc1..34f1d804c9 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -6221,7 +6221,6 @@ public final class NpcID public static final int GALLOW = 6775; public static final int MAN_6776 = 6776; public static final int MAZE_GUARDIAN = 6777; - public static final int MAZE_GUARDIAN_MOVING = 6778; public static final int MAZE_GUARDIAN_6779 = 6779; public static final int PILIAR = 6780; public static final int SHAYDA = 6781; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java index 5b2f4a42b6..6dc8834806 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java @@ -65,6 +65,7 @@ import net.runelite.client.plugins.mta.MTARoom; @Slf4j public class TelekineticRoom extends MTARoom { + private static final int MAZE_GUARDIAN_MOVING = 6778; private static final int TELEKINETIC_WALL = NullObjectID.NULL_10755; private static final int TELEKINETIC_FINISH = NullObjectID.NULL_23672; @@ -110,7 +111,7 @@ public class TelekineticRoom extends MTARoom else if (guardian != null) { WorldPoint current; - if (guardian.getId() == NpcID.MAZE_GUARDIAN_MOVING) + if (guardian.getId() == MAZE_GUARDIAN_MOVING) { destination = getGuardianDestination(); current = WorldPoint.fromLocal(client, destination); @@ -288,7 +289,7 @@ public class TelekineticRoom extends MTARoom private Stack build() { - if (guardian.getId() == NpcID.MAZE_GUARDIAN_MOVING) + if (guardian.getId() == MAZE_GUARDIAN_MOVING) { WorldPoint converted = WorldPoint.fromLocal(client, getGuardianDestination()); return build(converted);