ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fixed when Toggle Option is off on Login

Browse Source 
- This caused an issue where the delay would be ignored after setting it on after login
This commit is contained in:
Ermal Shkullaku
2019-01-19 13:23:52 -05:00
parent fd202035b5
commit 2d394a24a3
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java
View File

@@ -81,32 +81,34 @@ public class StatusBarsPlugin extends Plugin
@Subscribe @Subscribe
public void onGameTick(GameTick gameTick) 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()) if (!config.toggleRestorationBars())
{ {
overlayManager.add(overlay); overlayManager.add(overlay);
return; return;
} }
else
if (isNpc)
{ {
final NPC npc = (NPC) interacting; final Actor interacting = client.getLocalPlayer().getInteracting();
final NPCComposition npcComposition = npc.getComposition(); final boolean isNpc = interacting instanceof NPC;
final List<String> npcMenuActions = Arrays.asList(npcComposition.getActions()); final int COMBAT_TIMEOUT = config.hideStatusBarDelay();
if (npcMenuActions.contains("Attack"))
if (isNpc)
{
final NPC npc = (NPC) interacting;
final NPCComposition npcComposition = npc.getComposition();
final List<String> npcMenuActions = Arrays.asList(npcComposition.getActions());
if (npcMenuActions.contains("Attack") && config.toggleRestorationBars())
{ {
updateLastCombatAction(); updateLastCombatAction();
overlayManager.add(overlay); overlayManager.add(overlay);
} }
} }
else if (lastCombatAction != null) else if (lastCombatAction != null)
{
if (Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > COMBAT_TIMEOUT)
{ {
overlayManager.remove(overlay); if (Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > COMBAT_TIMEOUT)
{
overlayManager.remove(overlay);
}
} }
} }
} }