From 95290808714ae99da8647b15d32b3aba3c295e3a Mon Sep 17 00:00:00 2001 From: Fryslan Date: Sun, 5 Jun 2016 23:29:16 +0200 Subject: [PATCH] [FIX] FIxed NPE in Mysterious Man and Sandwich Lady Solvers --- .../java/org/parabot/randoms/pkhonor/MysteriousOldMan.java | 4 ++-- src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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