From 650d6a7e0dc416133a438d07fca1c9e4828f3bf0 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 30 Nov 2017 16:46:42 -0500 Subject: [PATCH] runelite-client: change AnimationChanged event to have an Actor --- .../src/main/java/net/runelite/client/callback/Hooks.java | 4 +++- .../java/net/runelite/client/events/AnimationChanged.java | 3 ++- .../client/plugins/idlenotifier/IdleNotifierPlugin.java | 8 +++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index be3d449545..8b40310813 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -29,6 +29,7 @@ import com.google.inject.Injector; import java.awt.Graphics; import java.awt.image.BufferedImage; import lombok.extern.slf4j.Slf4j; +import net.runelite.api.Actor; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.MainBufferProvider; @@ -137,8 +138,9 @@ public class Hooks } case "animationChanged": { + Actor actor = (Actor) object; AnimationChanged animationChange = new AnimationChanged(); - animationChange.setObject(object); + animationChange.setActor(actor); eventBus.post(animationChange); break; } diff --git a/runelite-client/src/main/java/net/runelite/client/events/AnimationChanged.java b/runelite-client/src/main/java/net/runelite/client/events/AnimationChanged.java index 20baaaaeac..5632878f88 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/AnimationChanged.java +++ b/runelite-client/src/main/java/net/runelite/client/events/AnimationChanged.java @@ -25,9 +25,10 @@ package net.runelite.client.events; import lombok.Data; +import net.runelite.api.Actor; @Data public class AnimationChanged { - private Object object; + private Actor actor; } 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 d2b40ed34c..53e3555d0b 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 @@ -86,8 +86,14 @@ public class IdleNotifierPlugin extends Plugin { return; } + + Player localPlayer = client.getLocalPlayer(); + if (localPlayer != event.getActor()) + { + return; + } - int animation = client.getLocalPlayer().getAnimation(); + int animation = localPlayer.getAnimation(); switch (animation) { /* Woodcutting */