From 59d877104b817d1e84de0262b89874fb3720d9c9 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Wed, 1 Feb 2017 20:46:02 +0000 Subject: [PATCH] [BUGFIX] Fixed a null pointer Also removed unused randoms and cleaned up code --- src/main/java/org/parabot/randoms/Core.java | 2 - .../parabot/randoms/elkoy/MouseOnScreen.java | 3 +- .../parabot/randoms/elkoy/QuestionSolver.java | 1 + .../org/parabot/randoms/pkhonor/BanFile.java | 3 +- .../parabot/randoms/pkhonor/BobsIsland.java | 3 -- .../org/parabot/randoms/pkhonor/Jail.java | 3 ++ .../randoms/pkhonor/MysteriousOldMan.java | 1 + .../pkhonor/PacketBlockInterceptor.java | 47 ------------------- .../parabot/randoms/pkhonor/SandwichLady.java | 1 + .../randoms/pkhonor/TriangleSandwich.java | 15 ++++-- 10 files changed, 20 insertions(+), 59 deletions(-) delete mode 100644 src/main/java/org/parabot/randoms/pkhonor/PacketBlockInterceptor.java diff --git a/src/main/java/org/parabot/randoms/Core.java b/src/main/java/org/parabot/randoms/Core.java index 4616a66..4a3d863 100755 --- a/src/main/java/org/parabot/randoms/Core.java +++ b/src/main/java/org/parabot/randoms/Core.java @@ -5,7 +5,6 @@ import org.parabot.environment.randoms.Random; import org.parabot.randoms.dreamscape.SerialBanAvoider; import org.parabot.randoms.elkoy.LogoutDisabler; import org.parabot.randoms.elkoy.MouseOnScreen; -import org.parabot.randoms.elkoy.QuestionSolver; import org.parabot.randoms.pkhonor.*; import java.util.ArrayList; @@ -23,7 +22,6 @@ public class Core { randoms.add(new SandwichLady()); randoms.add(new MysteriousOldMan()); randoms.add(new BobsIsland()); - randoms.add(new PacketBlockInterceptor()); // Dreamscape randoms.add(new SerialBanAvoider()); diff --git a/src/main/java/org/parabot/randoms/elkoy/MouseOnScreen.java b/src/main/java/org/parabot/randoms/elkoy/MouseOnScreen.java index 27de57e..e3c457b 100644 --- a/src/main/java/org/parabot/randoms/elkoy/MouseOnScreen.java +++ b/src/main/java/org/parabot/randoms/elkoy/MouseOnScreen.java @@ -21,6 +21,7 @@ public class MouseOnScreen implements Random { public void execute() { int x = org.parabot.environment.api.utils.Random.between(100, Context.getInstance().getApplet().getWidth()); int y = org.parabot.environment.api.utils.Random.between(100, Context.getInstance().getApplet().getHeight()); + Mouse.getInstance().moveMouse(x, y); } @@ -39,7 +40,7 @@ public class MouseOnScreen implements Random { return RandomType.SCRIPT; } - private boolean onScreen(){ + private boolean onScreen() { Point loc = Mouse.getInstance().getPoint(); return Context.getInstance().getApplet().contains(loc); } diff --git a/src/main/java/org/parabot/randoms/elkoy/QuestionSolver.java b/src/main/java/org/parabot/randoms/elkoy/QuestionSolver.java index 21b8fd8..d1eca82 100644 --- a/src/main/java/org/parabot/randoms/elkoy/QuestionSolver.java +++ b/src/main/java/org/parabot/randoms/elkoy/QuestionSolver.java @@ -69,6 +69,7 @@ public class QuestionSolver implements Random { } catch (MalformedURLException | UnsupportedEncodingException | ParseException e) { e.printStackTrace(); } + return null; } diff --git a/src/main/java/org/parabot/randoms/pkhonor/BanFile.java b/src/main/java/org/parabot/randoms/pkhonor/BanFile.java index a080496..56470af 100644 --- a/src/main/java/org/parabot/randoms/pkhonor/BanFile.java +++ b/src/main/java/org/parabot/randoms/pkhonor/BanFile.java @@ -20,6 +20,7 @@ public class BanFile implements Random { return true; } } + return false; } @@ -30,7 +31,6 @@ public class BanFile implements Random { banfile.delete(); } } - } @Override @@ -55,6 +55,7 @@ public class BanFile implements Random { return true; } } + return false; } } diff --git a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java index db10d44..5fd4c90 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java +++ b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java @@ -16,9 +16,6 @@ public class BobsIsland implements Random { private static final Tile center = new Tile(2525, 4777); private static final int portalId = 8987; - public BobsIsland() { - } - @Override public boolean activate() { return center.distanceTo() < 25; diff --git a/src/main/java/org/parabot/randoms/pkhonor/Jail.java b/src/main/java/org/parabot/randoms/pkhonor/Jail.java index 1da2501..ca7c8a1 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/Jail.java +++ b/src/main/java/org/parabot/randoms/pkhonor/Jail.java @@ -27,6 +27,7 @@ public class Jail implements Random { this.jailer = getJailer(); return true; } + return false; } catch (Exception e) { return false; @@ -91,6 +92,7 @@ public class Jail implements Random { return jailer; } } + return null; } @@ -100,6 +102,7 @@ public class Jail implements Random { return rock; } } + return null; } diff --git a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java index 8ea0e87..2f4445a 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java +++ b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java @@ -41,6 +41,7 @@ public class MysteriousOldMan implements Random { return man; } } + return null; } diff --git a/src/main/java/org/parabot/randoms/pkhonor/PacketBlockInterceptor.java b/src/main/java/org/parabot/randoms/pkhonor/PacketBlockInterceptor.java deleted file mode 100644 index 9fb690e..0000000 --- a/src/main/java/org/parabot/randoms/pkhonor/PacketBlockInterceptor.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.parabot.randoms.pkhonor; - -import org.parabot.core.reflect.RefClass; -import org.parabot.core.reflect.RefField; -import org.parabot.environment.randoms.Random; -import org.parabot.environment.randoms.RandomType; -import org.rev317.min.Loader; - -/** - * @author EmmaStone - */ -public class PacketBlockInterceptor implements Random { - - @Override - public boolean activate() { - return !getField(); - } - - @Override - public void execute() { - setField(); - } - - private boolean getField() { - return new RefClass(Loader.getClient()).getField("PG").asBoolean(); - } - - private void setField() { - RefField refField = new RefClass(Loader.getClient()).getField("PG"); - refField.set(true); - } - - @Override - public String getName() { - return "Packet Block Interceptor"; - } - - @Override - public String getServer() { - return "pkhonor"; - } - - @Override - public RandomType getRandomType() { - return RandomType.SCRIPT; - } -} diff --git a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java index 8fb676e..009371f 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java +++ b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java @@ -41,6 +41,7 @@ public class SandwichLady implements Random { return lady; } } + return null; } diff --git a/src/main/java/org/parabot/randoms/pkhonor/TriangleSandwich.java b/src/main/java/org/parabot/randoms/pkhonor/TriangleSandwich.java index 544d6b4..1a25d03 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/TriangleSandwich.java +++ b/src/main/java/org/parabot/randoms/pkhonor/TriangleSandwich.java @@ -17,23 +17,28 @@ public class TriangleSandwich implements Random { @Override public boolean activate() { - for (Item i : Inventory.getItems(id)) { - if (i != null) { - this.item = i; - return true; + if (Inventory.getItems() != null) { + for (Item i : Inventory.getItems(id)) { + if (i != null) { + this.item = i; + return true; + + } } } + return false; } @Override public void execute() { if (this.item != null) { + final int sandwich = Inventory.getCount(id); item.drop(); Time.sleep(new SleepCondition() { @Override public boolean isValid() { - return Inventory.getCount(id) == 0; + return Inventory.getCount(id) != sandwich; } }, 1500); }