From 2b961d94b9497c00c891de6545f09f24f950c1f8 Mon Sep 17 00:00:00 2001
From: Fryslan <pietjetse@outlook.com>
Date: Mon, 6 Jun 2016 13:35:59 +0200
Subject: [PATCH] [CLASS REWRITE] Rewritten Mysterious Old Man random.

---
 .gitignore                                    |  3 ++-
 .../randoms/pkhonor/MysteriousOldMan.java     | 27 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e350c0..40d0328 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,4 +68,5 @@ fabric.properties
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
-*.iml
\ No newline at end of file
+*.iml
+.i€dea
\ No newline at end of file
diff --git a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java
index 84624d4..f701540 100755
--- a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java
+++ b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java
@@ -12,32 +12,37 @@ import org.rev317.min.api.wrappers.Npc;
  */
 public class MysteriousOldMan implements Random {
 
-    Npc man;
+    private Npc man;
+    private final int ID = 410;
 
     @Override
     public boolean activate() {
-        for (Npc npc : Npcs.getNearest(410)) {
-            if (npc != null && npc.getDef() != null && npc.getInteractingCharacter().equals(Players.getMyPlayer())) {
-                man = npc;
-                return true;
-            }
-        }
-        return false;
+        this.man = man();
+        return man != null;
     }
 
     @Override
     public void execute() {
-        if (man != null && man.getDef() != null && man.getInteractingCharacter().equals(Players.getMyPlayer())) {
-            man.interact(0);
+        if (this.man != null) {
+            man.interact(Npcs.Option.TALK_TO);
             Time.sleep(new SleepCondition() {
                 @Override
                 public boolean isValid() {
-                    return !man.getInteractingCharacter().equals(Players.getMyPlayer());
+                    return man == null || !man.getInteractingCharacter().equals(Players.getMyPlayer());
                 }
             }, 1500);
         }
     }
 
+    private Npc man() {
+        for (Npc man : Npcs.getNearest(ID)) {
+            if (man != null && man.getDef() != null && man.getInteractingCharacter().equals(Players.getMyPlayer())) {
+                return man;
+            }
+        }
+        return null;
+    }
+
     @Override
     public String getName() {
         return "Mysterious Old Man Solver";