diff --git a/.idea/modules.xml b/.idea/modules.xml index 06e68c3..0227245 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,6 +2,7 @@ + diff --git a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java index 04f36b2..dd1bd38 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java +++ b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java @@ -19,38 +19,35 @@ import java.util.ArrayList; */ public class BobsIsland implements Random { - private final int PORTAL = 8987; - private ArrayList portals; - private final Area ISLAND = new Area(new Tile(2511, 4765), new Tile(2511, 4790), new Tile(2542, 4790), new Tile(2542, 4765)); + private static final Tile CENTER = new Tile(2525,4777); + private static final int PORTAL_ID = 8987; public BobsIsland() { - portals = new ArrayList<>(); } @Override public boolean activate() { - return ISLAND.contains(Players.getMyPlayer().getLocation()); + return CENTER.distanceTo() < 25; } @Override public void execute() { - //Fill The ArrayList - for (SceneObject portal : SceneObjects.getNearest(PORTAL)) { - if (portal != null) { - portals.add(portal); - } - } + SceneObject[] portals = SceneObjects.getNearest(PORTAL_ID); - //Loop through the portals - for (final SceneObject portal : portals) { - if (portal != null) { - portal.interact(0); + for(final SceneObject portal : portals){ + if(portal != null){ + portal.interact(SceneObjects.Option.FIRST); Time.sleep(new SleepCondition() { @Override public boolean isValid() { return portal.distanceTo() < 2; } - }, 7500); + }, 10000); + Time.sleep(1000); + + if(CENTER.distanceTo() > 24){ + break; + } } } } diff --git a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java index 36e0846..84624d4 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java +++ b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java @@ -17,7 +17,7 @@ public class MysteriousOldMan implements Random { @Override public boolean activate() { for (Npc npc : Npcs.getNearest(410)) { - if (npc != null && npc.getInteractingCharacter().equals(Players.getMyPlayer())) { + if (npc != null && npc.getDef() != null && npc.getInteractingCharacter().equals(Players.getMyPlayer())) { man = npc; return true; } @@ -27,7 +27,7 @@ public class MysteriousOldMan implements Random { @Override public void execute() { - if (man != null && man.getInteractingCharacter().equals(Players.getMyPlayer())) { + if (man != null && man.getDef() != null && man.getInteractingCharacter().equals(Players.getMyPlayer())) { man.interact(0); Time.sleep(new SleepCondition() { @Override diff --git a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java index 8bd7da6..bcaa9c3 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java +++ b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java @@ -17,7 +17,7 @@ public class SandwichLady implements Random { @Override public boolean activate() { for (Npc npc : Npcs.getNearest(3117)) { - if (npc != null && npc.getInteractingCharacter().equals(Players.getMyPlayer())) { + if (npc != null && npc.getDef() != null && npc.getInteractingCharacter().equals(Players.getMyPlayer())) { lady = npc; return true; } @@ -27,7 +27,7 @@ public class SandwichLady implements Random { @Override public void execute() { - if (lady != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) { + if (lady != null && lady.getDef() != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) { lady.interact(0); Time.sleep(new SleepCondition() { @Override