From 1fa13eb60ed0580625e769480c35ae1748b06a96 Mon Sep 17 00:00:00 2001 From: Seth Date: Tue, 30 Jan 2018 12:36:12 -0600 Subject: [PATCH 1/2] Fix spelling error on timer --- .../main/java/net/runelite/client/plugins/timers/GameTimer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 561618c374..4582de5360 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 @@ -62,7 +62,7 @@ public enum GameTimer IMBUEDHEART("imbuedheart", "Imbued heart", GraphicID.IMBUED_HEART, 420, ChronoUnit.SECONDS), VENGEANCE("vengeance", "Vengeance", GraphicID.VENGEANCE, 30, ChronoUnit.SECONDS), ANTIDOTEPLUS("antidoteplus", "Antidote+", 518, ChronoUnit.SECONDS), - ANTIVENOM("antivenom", "Anto-venom", 12, ChronoUnit.MINUTES), + ANTIVENOM("antivenom", "Anti-venom", 12, ChronoUnit.MINUTES), EXSUPERANTIFIRE("exsuperantifire", "Extended Super AntiFire", 6, ChronoUnit.MINUTES), SANFEW("sanfew", "Sanfew serum", 6, ChronoUnit.MINUTES), OVERLOAD_RAID("overloadraid", "Overload", 5, ChronoUnit.MINUTES), From 00b799ab4dceca6af08ab15d22784ff239471975 Mon Sep 17 00:00:00 2001 From: Seth Date: Tue, 30 Jan 2018 12:36:46 -0600 Subject: [PATCH 2/2] Add raid varbit check to remove timers --- .../client/plugins/timers/TimersPlugin.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 2ba0f30966..e136d32843 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 @@ -63,6 +63,7 @@ import net.runelite.api.ItemID; import net.runelite.api.Prayer; import net.runelite.api.Varbits; import net.runelite.api.events.GraphicChanged; +import net.runelite.api.events.VarbitChanged; import net.runelite.client.config.ConfigManager; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; @@ -76,6 +77,8 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; ) public class TimersPlugin extends Plugin { + private int lastRaidVarb; + @Inject Client client; @@ -97,6 +100,18 @@ public class TimersPlugin extends Plugin infoBoxManager.removeIf(t -> t instanceof TimerTimer); } + @Subscribe + public void onVarbitChange(VarbitChanged event) + { + int raidVarb = client.getSetting(Varbits.IN_RAID); + if (lastRaidVarb != raidVarb) + { + removeGameTimer(OVERLOAD_RAID); + removeGameTimer(PRAYER_ENHANCE); + lastRaidVarb = raidVarb; + } + } + @Subscribe public void updateConfig(ConfigChanged event) {