From e32c88b82a2e37c3799545a2f9a6e7f887c1b313 Mon Sep 17 00:00:00 2001
From: Fryslan <pietjetse@outlook.com>
Date: Mon, 6 Jun 2016 22:40:39 +0200
Subject: [PATCH] [NAMING] Used Correct Naming Convention and Renamed get
 Methods.

---
 .../org/parabot/randoms/pkhonor/MysteriousOldMan.java  | 10 +++++-----
 .../java/org/parabot/randoms/pkhonor/SandwichLady.java | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java
index f701540..02f9ca8 100755
--- a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java
+++ b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java
@@ -13,11 +13,11 @@ import org.rev317.min.api.wrappers.Npc;
 public class MysteriousOldMan implements Random {
 
     private Npc man;
-    private final int ID = 410;
+    private final int id = 410;
 
     @Override
     public boolean activate() {
-        this.man = man();
+        this.man = getMan();
         return man != null;
     }
 
@@ -28,14 +28,14 @@ public class MysteriousOldMan implements Random {
             Time.sleep(new SleepCondition() {
                 @Override
                 public boolean isValid() {
-                    return man == null || !man.getInteractingCharacter().equals(Players.getMyPlayer());
+                    return man.distanceTo() < 2 || !man.getInteractingCharacter().equals(Players.getMyPlayer());
                 }
             }, 1500);
         }
     }
 
-    private Npc man() {
-        for (Npc man : Npcs.getNearest(ID)) {
+    private Npc getMan() {
+        for (Npc man : Npcs.getNearest(id)) {
             if (man != null && man.getDef() != null && man.getInteractingCharacter().equals(Players.getMyPlayer())) {
                 return man;
             }
diff --git a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java
index dde3c6b..b187622 100755
--- a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java
+++ b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java
@@ -13,11 +13,11 @@ import org.rev317.min.api.wrappers.Npc;
 public class SandwichLady implements Random {
 
     private Npc lady;
-    private final int ID = 3117;
+    private final int id = 3117;
 
     @Override
     public boolean activate() {
-        this.lady = lady();
+        this.lady = getLady();
         return this.lady != null;
     }
 
@@ -28,14 +28,14 @@ public class SandwichLady implements Random {
             Time.sleep(new SleepCondition() {
                 @Override
                 public boolean isValid() {
-                    return lady == null || !lady.getInteractingCharacter().equals(Players.getMyPlayer());
+                    return lady.distanceTo() < 2 || !lady.getInteractingCharacter().equals(Players.getMyPlayer());
                 }
             }, 1500);
         }
     }
 
-    private Npc lady() {
-        for (Npc lady : Npcs.getNearest(ID)) {
+    private Npc getLady() {
+        for (Npc lady : Npcs.getNearest(id)) {
             if (lady != null && lady.getDef() != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) {
                 return lady;
             }