From 7efb8ab48697420ec19bd2f5295e8ec0eb2c80d6 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Thu, 25 Jan 2018 20:14:25 +0100 Subject: [PATCH] Fix idle animation plugin timer cancelling - Cancel animation idle timer when combat begins - Cancel combat idle timer when animation begins Signed-off-by: Tomas Slusny --- .../plugins/idlenotifier/IdleNotifierPlugin.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index cf3c10609a..26c0a66274 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -240,8 +240,8 @@ public class IdleNotifierPlugin extends Plugin case HERBLORE_MAKE_TAR: /* Magic */ case MAGIC_CHARGING_ORBS: + resetTimers(); notifyIdle = true; - lastAnimating = null; break; } } @@ -366,6 +366,7 @@ public class IdleNotifierPlugin extends Plugin && opponent.getCombatLevel() > 0 && opponent.getHealth() != -1) { + resetTimers(); lastOpponent = opponent; } else if (opponent == null) @@ -461,4 +462,15 @@ public class IdleNotifierPlugin extends Plugin notifier.notify(message); } } + + private void resetTimers() + { + // Reset animation idle timer + notifyIdle = false; + lastAnimating = null; + + // Reset combat idle timer + lastOpponent = null; + lastInteracting = null; + } }