diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/frosty/frostyrc/RcPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/frosty/frostyrc/RcPlugin.java index 8453221403b..fadfa51a1aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/frosty/frostyrc/RcPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/frosty/frostyrc/RcPlugin.java @@ -57,7 +57,7 @@ RcConfig provideConfig(ConfigManager configManager) { @Getter private WorldPoint myWorldPoint; @Getter - public static String version = "v1.1.0"; + public static String version = "v1.1.2"; @Subscribe public void onGameObjectSpawned(GameObjectSpawned event) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/frosty/frostyrc/RcScript.java b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/frosty/frostyrc/RcScript.java index 1f410cef8af..4e39cd052bf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/frosty/frostyrc/RcScript.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/frosty/frostyrc/RcScript.java @@ -101,6 +101,7 @@ public boolean run() { try { if (!Microbot.isLoggedIn()) return; if (!super.run()) return; + if (shouldPauseForBreak()) return; long startTime = System.currentTimeMillis(); if (lumbyElite == -1) { @@ -160,6 +161,23 @@ public void shutdown() { //Rs2Player.logout(); } + private boolean shouldPauseForBreak() { + if (!plugin.isBreakHandlerEnabled()) { + return false; + } + + if (BreakHandlerScript.isBreakActive()) { + return true; + } + + if (BreakHandlerScript.breakIn <= 0) { + BreakHandlerScript.setLockState(false); + return true; + } + + return false; + } + private void checkPouches() { Rs2Inventory.interact(colossalPouch, "Check"); sleepGaussian(900, 200); @@ -176,18 +194,22 @@ private void handleBanking() { } } + if (plugin.isBreakHandlerEnabled()) { + BreakHandlerScript.setLockState(true); + } + Rs2Tab.switchToInventoryTab(); + if (Rs2Inventory.hasDegradedPouch()) { + Rs2Magic.repairPouchesWithLunar(); + sleepGaussian(900, 200); + return; + } + if (Rs2Inventory.anyPouchUnknown()) { checkPouches(); } - if (Rs2Inventory.hasDegradedPouch()) { - Rs2Magic.repairPouchesWithLunar(); - sleepGaussian(900, 200); - return; - } - if (Rs2Inventory.isFull() && Rs2Inventory.allPouchesFull() && Rs2Inventory.contains(pureEss)) { Microbot.log("We are full, skipping bank"); state = State.GOING_HOME; @@ -197,10 +219,6 @@ private void handleBanking() { handleFeroxRunEnergy(); } - if (plugin.isBreakHandlerEnabled()) { - BreakHandlerScript.setLockState(false); - } - while (!Rs2Bank.isOpen() && isRunning() && (!Rs2Inventory.allPouchesFull() || !Rs2Inventory.contains(colossalPouch) @@ -456,6 +474,8 @@ private void handleWrathWalking() { BreakHandlerScript.setLockState(true); } + if (Rs2Bank.isOpen()) { Rs2Bank.closeBank(); } + if (Rs2Inventory.contains(mythCape)) { Microbot.log("Interacting with myth cape"); Rs2Inventory.interact(mythCape, "Teleport"); @@ -721,6 +741,9 @@ private void handleCrafting() { if (plugin.isBreakHandlerEnabled()) { BreakHandlerScript.setLockState(false); + if (BreakHandlerScript.isBreakActive() || BreakHandlerScript.breakIn <= 0) { + return; + } } state = State.BANKING;