From 5fca70b0565212f2cfd0aed0f0702b4727ce2f2a Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 20 May 2018 12:42:50 -0400 Subject: [PATCH] agility plugin: limit obstacles to agility pyramid regions --- .../net/runelite/client/plugins/agility/AgilityPlugin.java | 3 ++- .../java/net/runelite/client/plugins/agility/Obstacles.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java index f58c32ab1d..5726ce12dd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java @@ -287,7 +287,8 @@ public class AgilityPlugin extends Plugin if (Obstacles.COURSE_OBSTACLE_IDS.contains(newObject.getId()) || Obstacles.SHORTCUT_OBSTACLE_IDS.contains(newObject.getId()) || - Obstacles.TRAP_OBSTACLE_IDS.contains(newObject.getId())) + (Obstacles.TRAP_OBSTACLE_IDS.contains(newObject.getId()) + && Obstacles.TRAP_OBSTACLE_REGIONS.contains(newObject.getWorldLocation().getRegionID()))) { obstacles.put(newObject, tile); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java index 63a28a7928..726c9f03c9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java @@ -24,7 +24,9 @@ */ package net.runelite.client.plugins.agility; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import java.util.List; import java.util.Set; import static net.runelite.api.ObjectID.*; @@ -185,4 +187,6 @@ public class Obstacles // Agility pyramid NULL_3550, NULL_10872, NULL_10873 ); + + public static final List TRAP_OBSTACLE_REGIONS = ImmutableList.of(12105, 13356); }