From 2d394a24a39d15e68413564297f7b1fe41717b6f Mon Sep 17 00:00:00 2001 From: Ermal Shkullaku Date: Sat, 19 Jan 2019 13:23:52 -0500 Subject: [PATCH] Fixed when Toggle Option is off on Login - This caused an issue where the delay would be ignored after setting it on after login --- .../plugins/statusbars/StatusBarsPlugin.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java index 3c163a5b18..33914f4633 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java @@ -81,32 +81,34 @@ public class StatusBarsPlugin extends Plugin @Subscribe public void onGameTick(GameTick gameTick) { - final Actor interacting = client.getLocalPlayer().getInteracting(); - final boolean isNpc = interacting instanceof NPC; - final int COMBAT_TIMEOUT = config.hideStatusBarDelay(); - if (!config.toggleRestorationBars()) { overlayManager.add(overlay); return; } - - if (isNpc) + else { - final NPC npc = (NPC) interacting; - final NPCComposition npcComposition = npc.getComposition(); - final List npcMenuActions = Arrays.asList(npcComposition.getActions()); - if (npcMenuActions.contains("Attack")) + final Actor interacting = client.getLocalPlayer().getInteracting(); + final boolean isNpc = interacting instanceof NPC; + final int COMBAT_TIMEOUT = config.hideStatusBarDelay(); + + if (isNpc) + { + final NPC npc = (NPC) interacting; + final NPCComposition npcComposition = npc.getComposition(); + final List npcMenuActions = Arrays.asList(npcComposition.getActions()); + if (npcMenuActions.contains("Attack") && config.toggleRestorationBars()) { updateLastCombatAction(); overlayManager.add(overlay); } - } - else if (lastCombatAction != null) - { - if (Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > COMBAT_TIMEOUT) + } + else if (lastCombatAction != null) { - overlayManager.remove(overlay); + if (Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > COMBAT_TIMEOUT) + { + overlayManager.remove(overlay); + } } } }