diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/PlayerAssistPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/PlayerAssistPlugin.java index 325425502e..f1d9c1f970 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/PlayerAssistPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/PlayerAssistPlugin.java @@ -51,7 +51,7 @@ ) @Slf4j public class PlayerAssistPlugin extends Plugin { - public static final String version = "1.3.0"; + public static final String version = "1.3.1"; private static final String SET = "Set"; private static final String CENTER_TILE = ColorUtil.wrapWithColorTag("Center Tile", JagexColors.MENU_TARGET); // SAFE_SPOT = "Safe Spot"; @@ -186,6 +186,13 @@ private void setInventorySetup(InventorySetup inventorySetup) { ); } + public static String getState() { + return Microbot.getConfigManager().getConfiguration( + "PlayerAssistant", + "state" + ); + } + public static void setState(State state) { Microbot.getConfigManager().setConfiguration( "PlayerAssistant", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/combat/SafeSpot.java b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/combat/SafeSpot.java index ea5028e822..16b442494a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/combat/SafeSpot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/combat/SafeSpot.java @@ -6,6 +6,7 @@ import net.runelite.client.plugins.microbot.Script; import net.runelite.client.plugins.microbot.playerassist.PlayerAssistConfig; import net.runelite.client.plugins.microbot.playerassist.PlayerAssistPlugin; +import net.runelite.client.plugins.microbot.playerassist.enums.State; import net.runelite.client.plugins.microbot.util.npc.Rs2Npc; import net.runelite.client.plugins.microbot.util.player.Rs2Player; import net.runelite.client.plugins.microbot.util.walker.Rs2Walker; @@ -25,6 +26,7 @@ public boolean run(PlayerAssistConfig config) { AtomicReference> npcsToAttack = new AtomicReference<>(Arrays.stream(Arrays.stream(config.attackableNpcs().split(",")).map(String::trim).toArray(String[]::new)).collect(Collectors.toList())); mainScheduledFuture = scheduledExecutorService.scheduleWithFixedDelay(() -> { try { + if (PlayerAssistPlugin.getState() == State.BANKING.name() || PlayerAssistPlugin.getState() == State.WALKING.name()) return; if (!Microbot.isLoggedIn() || !super.run() || !config.toggleSafeSpot() || Rs2Player.isMoving()) return; currentSafeSpot = config.safeSpot(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/loot/LootScript.java b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/loot/LootScript.java index 1028f851f5..82d656baeb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/loot/LootScript.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/playerassist/loot/LootScript.java @@ -4,6 +4,7 @@ import net.runelite.client.plugins.microbot.Microbot; import net.runelite.client.plugins.microbot.Script; import net.runelite.client.plugins.microbot.playerassist.PlayerAssistConfig; +import net.runelite.client.plugins.microbot.playerassist.PlayerAssistPlugin; import net.runelite.client.plugins.microbot.playerassist.enums.DefaultLooterStyle; import net.runelite.client.plugins.microbot.playerassist.enums.State; import net.runelite.client.plugins.microbot.util.combat.Rs2Combat; @@ -27,6 +28,7 @@ public boolean run(PlayerAssistConfig config) { mainScheduledFuture = scheduledExecutorService.scheduleWithFixedDelay(() -> { if (!super.run()) return; if (!Microbot.isLoggedIn()) return; + if (PlayerAssistPlugin.getState() == State.BANKING.name() || PlayerAssistPlugin.getState() == State.WALKING.name()) return; if (Rs2Inventory.isFull() || Rs2Inventory.getEmptySlots() <= config.minFreeSlots() || (Rs2Combat.inCombat() && !config.toggleForceLoot())) return;