Fixed when Toggle Option is off on Login

- 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

View File

@@ -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<String> 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<String> 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);
}
}
}
}