From 1ae1362410118020179c7159d4c7545aadab2fbd Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sat, 17 Feb 2018 22:09:22 -0700 Subject: [PATCH 1/2] hunter plugin: add imp box --- .../net/runelite/client/plugins/hunter/HunterPlugin.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java index d0ff9e1efd..2c8cf113bb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java @@ -124,6 +124,7 @@ public class HunterPlugin extends Plugin lastActionTime = Instant.now(); } break; + case ObjectID.MAGIC_BOX: // Imp box placed case ObjectID.BOX_TRAP_9380: //Box trap placed case ObjectID.BIRD_SNARE_9345: //Bird snare placed case ObjectID.NET_TRAP_9343: //Net trap placed at green sallys @@ -154,6 +155,7 @@ public class HunterPlugin extends Plugin } break; + case ObjectID.MAGIC_BOX_19226: // Imp caught case ObjectID.SHAKING_BOX: //Black chinchompa caught case ObjectID.SHAKING_BOX_9382: // Grey chinchompa caught case ObjectID.SHAKING_BOX_9383: //Red chinchompa caught @@ -180,6 +182,7 @@ public class HunterPlugin extends Plugin lastActionTime = Instant.now(); } break; + case ObjectID.MAGIC_BOX_FAILED: //Empty imp box case ObjectID.BOX_TRAP_9385: //Empty box trap case ObjectID.BIRD_SNARE: //Empty box trap if (myTrap != null) @@ -192,6 +195,9 @@ public class HunterPlugin extends Plugin lastActionTime = Instant.now(); } break; + // Imp entering box + case ObjectID.MAGIC_BOX_19225: + //Black chin shaking box case ObjectID.BOX_TRAP: case ObjectID.BOX_TRAP_2026: From f7c59bf8ba6c6e189e246ac978173d5d9f23c653 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sat, 17 Feb 2018 22:09:48 -0700 Subject: [PATCH 2/2] hunter plugin: Fix null pointer when going across a loading zone --- .../java/net/runelite/client/plugins/hunter/TrapOverlay.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java index ce428edf4b..026101d43b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java @@ -110,7 +110,8 @@ public class TrapOverlay extends Overlay Widget viewport = client.getViewportWidget(); for (HunterTrap trap : plugin.getTraps()) { - if (viewport != null && viewport.contains(trap.getGameObject().getCanvasLocation())) + net.runelite.api.Point trapLoc = trap.getGameObject().getCanvasLocation(); + if (viewport != null && trapLoc != null && viewport.contains(trapLoc)) { switch (trap.getState()) {