Fix #58 - Client settings not being configured when player starts on Tutorial Island

Author: Explv

AIO/src/org/aio/activities/tutorial_island/RuneScapeGuideSection.java

@@ -64,8 +64,6 @@ public final void onLoop() throws InterruptedException {
                     isAudioDisabled = disableAudio();
                 } else if (!getSettings().areRoofsEnabled()) {
                     toggleRoofsHidden();
-                } else if (!getSettings().isShiftDropActive()) {
-                    toggleShiftDrop();
                 } else if (getObjects().closest("Door").interact("Open")) {
                     Sleep.sleepUntil(() -> getProgress() != 10, 5000, 600);
                 }

AIO/src/org/aio/script/AIO.java

@@ -7,6 +7,7 @@
 import org.aio.paint.MouseTrail;
 import org.aio.paint.Paint;
 import org.aio.tasks.Task;
+import org.aio.tasks.TutorialIslandTask;
 import org.aio.tasks.task_executor.TaskExecutor;
 import org.aio.util.SkillTracker;
 import org.aio.util.event.EnableFixedModeEvent;
@@ -25,7 +26,7 @@
 import java.util.List;
 import java.util.Optional;
 
-@ScriptManifest(author = "Explv", name = "Explv's AIO v4.0", info = "AIO", version = 4.0, logo = "http://i.imgur.com/58Zz0fb.png")
+@ScriptManifest(author = "Explv", name = "Explv's AIO v4.1", info = "AIO", version = 4.1, logo = "http://i.imgur.com/58Zz0fb.png")
 public class AIO extends Script {
 
     private Gui gui;
@@ -140,7 +141,7 @@ private List<Task> loadTasksFromGUI() throws InterruptedException {
 
     @Override
     public int onLoop() throws InterruptedException {
-        if (!osrsClientIsConfigured && !Tab.SETTINGS.isDisabled(getBot())) {
+        if (!osrsClientIsConfigured && osrsClientIsConfigurable()) {
             osrsClientIsConfigured = configureOSRSClient();
         } else if (taskExecutor.isComplete()) {
             stop(true);
@@ -150,6 +151,14 @@ public int onLoop() throws InterruptedException {
         return random(200, 300);
     }
 
+    private boolean osrsClientIsConfigurable() {
+        return !Tab.SETTINGS.isDisabled(getBot()) &&
+               !getDialogues().isPendingContinuation() &&
+               !myPlayer().isAnimating() &&
+               taskExecutor.getCurrentTask() != null &&
+               !(taskExecutor.getCurrentTask() instanceof TutorialIslandTask);
+    }
+
     private boolean configureOSRSClient() {
         if (!EnableFixedModeEvent.isFixedModeEnabled(getBot().getMethods())) {
             execute(new EnableFixedModeEvent());

AIO/src/org/aio/tasks/task_executor/TaskExecutor.java

@@ -20,6 +20,10 @@ public TaskExecutor(final List<Task> tasks) {
         this.taskQueue.addAll(tasks);
     }
 
+    public Task getCurrentTask() {
+        return currentTask;
+    }
+
     public void setTaskQueue(final List<Task> taskQueue) {
         this.taskQueue.clear();
         this.taskQueue.addAll(taskQueue);