From cb2884b1ac281c8870bb1668b69e11fb433f0164 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 28 Jun 2018 16:11:56 -0700 Subject: [PATCH] timers plugin: Check for Vengeance Other graphic Fixes runelite/runelite#4052 --- .../java/net/runelite/client/plugins/timers/GameTimer.java | 2 +- .../java/net/runelite/client/plugins/timers/TimersPlugin.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java index 45b882fe99..df6a39cb07 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java @@ -60,7 +60,7 @@ public enum GameTimer ICEBARRAGE("icebarrage", "Ice barrage", GraphicID.ICE_BARRAGE, 20, ChronoUnit.SECONDS), IMBUEDHEART("imbuedheart", "Imbued heart", GraphicID.IMBUED_HEART, 420, ChronoUnit.SECONDS), VENGEANCE("vengeance", "Vengeance", GraphicID.VENGEANCE, 30, ChronoUnit.SECONDS), - VENGEANCEOTHER("vengeanceother", "Vengeance Other", -1, 30, ChronoUnit.SECONDS), + VENGEANCEOTHER("vengeanceother", "Vengeance Other", GraphicID.VENGEANCE_OTHER, 30, ChronoUnit.SECONDS), ANTIDOTEPLUS("antidoteplus", "Antidote+", 518, ChronoUnit.SECONDS), ANTIVENOM("antivenom", "Anti-venom", 12, ChronoUnit.MINUTES), EXSUPERANTIFIRE("exsuperantifire", "Extended Super AntiFire", 6, ChronoUnit.MINUTES), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 50e82883b2..0782958a6c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -445,7 +445,9 @@ public class TimersPlugin extends Plugin return; } - if (config.showVengeanceOther() && actor.getAnimation() == AnimationID.ENERGY_TRANSFER_VENGEANCE_OTHER) + if (config.showVengeanceOther() + && actor.getAnimation() == AnimationID.ENERGY_TRANSFER_VENGEANCE_OTHER + && actor.getInteracting().getGraphic() == VENGEANCEOTHER.getGraphicId()) { createGameTimer(VENGEANCEOTHER); }