2006-Scape/Parabot-Randoms
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot-Randoms.git synced 2026-07-04 00:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from Parabot/Fixes

Browse Source 
Fixes
This commit is contained in:
Jeroen Ketelaar
2016-06-05 23:46:49 +02:00
parent 3fba67901e 9529080871
commit 2d0366e044
4 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+1
View File
@@ -2,6 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Randoms.iml" filepath="$PROJECT_DIR$/.idea/Randoms.iml" />
<module fileurl="file://$PROJECT_DIR$/Randoms.iml" filepath="$PROJECT_DIR$/Randoms.iml" />
</modules>
</component>
src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java
+13 -16
View File
@@ -19,38 +19,35 @@ import java.util.ArrayList;
*/
public class BobsIsland implements Random {
private final int PORTAL = 8987;
private ArrayList<SceneObject> 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;
}
}
}
}
src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java
+2 -2
View File
@@ -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
src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java
+2 -2
View File
@@ -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