Skip to content

Fix/aio magic splashing #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chsami merged 6 commits into from
Jun 2, 2026
Merged

Fix/aio magic splashing #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed9a10c
Merge pull request #432 from chsami/development
chsami May 10, 2026
eb958f5
Merge pull request #434 from chsami/development
chsami May 11, 2026
1561554
Merge pull request #441 from chsami/development
chsami May 18, 2026
bc68209
Merge pull request #443 from chsami/development
chsami May 20, 2026
b3b4a4e
Development (#449)
chsami May 22, 2026
987c793
fix(aiomagic): improve splashing reliability and add location warnings
irkedMATT Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/runelite/client/plugins/microbot/aiomagic/AIOMagicPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ AIOMagicConfig provideConfig(ConfigManager configManager) {
@Inject
private SpinFlaxScript spinFlaxScript;

public final static String version = "1.2.7";
public final static String version = "1.2.8";

@Override
protected void startUp() throws AWTException {
Expand Down
19 changes: 18 additions & 1 deletion src/main/java/net/runelite/client/plugins/microbot/aiomagic/scripts/SplashScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.runelite.client.plugins.microbot.aiomagic.scripts;

import net.runelite.api.Actor;
import net.runelite.client.plugins.microbot.Microbot;
import net.runelite.client.plugins.microbot.Script;
import net.runelite.client.plugins.microbot.api.npc.models.Rs2NpcModel;
Expand All @@ -17,6 +18,7 @@
public class SplashScript extends Script {

private final AIOMagicPlugin plugin;
private long lastAnimationTime = System.currentTimeMillis();

@Inject
public SplashScript(AIOMagicPlugin plugin) {
Expand All @@ -34,6 +36,7 @@ public boolean run() {
Rs2AntibanSettings.moveMouseOffScreen = true;
Rs2AntibanSettings.moveMouseOffScreenChance = 1.0;
Rs2Antiban.setActivity(Activity.SPLASHING);
lastAnimationTime = System.currentTimeMillis();
mainScheduledFuture = scheduledExecutorService.scheduleWithFixedDelay(() -> {
try {
if (!Microbot.isLoggedIn()) return;
Expand All @@ -51,7 +54,21 @@ public boolean run() {
return;
}

if (Rs2Player.isMoving() || Rs2Combat.inCombat()) return;
if (Rs2Player.isMoving()) return;

if (Rs2Player.getAnimation() != -1) {
lastAnimationTime = System.currentTimeMillis();
}

Actor interacting = Rs2Player.getInteracting();
if (interacting != null && interacting.getName() != null && interacting.getName().equalsIgnoreCase(plugin.getNpcName())) {
// If we are interacting but haven't animated in 10 seconds, we've likely timed out
if (System.currentTimeMillis() - lastAnimationTime < 10000) {
return;
}
Microbot.log("Splashing stalled or timed out. Re-engaging...");
}

if (Rs2AntibanSettings.actionCooldownActive) return;

String targetNpcName = plugin.getNpcName() == null ? "" : plugin.getNpcName().trim();
Expand Down
Loading