From f471ceee071a7efe056d2e6a6b2e8e261520a49f Mon Sep 17 00:00:00 2001
From: PBLord <PBLord@users.noreply.github.com>
Date: Fri, 25 Aug 2017 12:38:46 +0100
Subject: [PATCH 1/4] Combat Stone Random

---
 .../org/parabot/randoms/pkhonor/CombatStone   | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 src/main/java/org/parabot/randoms/pkhonor/CombatStone

diff --git a/src/main/java/org/parabot/randoms/pkhonor/CombatStone b/src/main/java/org/parabot/randoms/pkhonor/CombatStone
new file mode 100644
index 0000000..0fbabc1
--- /dev/null
+++ b/src/main/java/org/parabot/randoms/pkhonor/CombatStone
@@ -0,0 +1,63 @@
+package org.parabot.randoms.pkhonor;
+
+import org.parabot.environment.api.utils.Time;
+import org.parabot.environment.randoms.Random;
+import org.parabot.environment.randoms.RandomType;
+import org.parabot.environment.scripts.framework.SleepCondition;
+import org.rev317.min.api.methods.Npcs;
+import org.rev317.min.api.methods.Players;
+import org.rev317.min.api.wrappers.Npc;
+
+/**
+ * @author Updated Lord
+ */
+public class CombatStone implements Random {
+
+    private Npc combat;
+    private final int id = 17025;
+
+    @Override
+    public boolean activate() {
+        this.combat = getLady();
+        return this.combat != null;
+    }
+
+    @Override
+    public void execute() {
+        System.out.println("Running CombatStone");
+        if (this.combat != null) {
+            combat.interact(Npcs.Option.TALK_TO);
+            Time.sleep(new SleepCondition() {
+                @Override
+                public boolean isValid() {
+                    return combat.distanceTo() > 0 || !combat.getInteractingCharacter().equals(Players.getMyPlayer());
+                }
+            }, 1500);
+        }
+    }
+
+    private Npc getLady() {
+        for (Npc lady : Npcs.getNearest(id)) {
+            if (lady != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) {
+                return lady;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return "CombatStone Solver";
+    }
+
+    @Override
+    public String getServer() {
+        return "pkhonor";
+    }
+
+    @Override
+    public RandomType getRandomType() {
+        return RandomType.SCRIPT;
+    }
+}

From 78be0eefb9cd25547353180aabad3a5c1ea12879 Mon Sep 17 00:00:00 2001
From: PBLord <PBLord@users.noreply.github.com>
Date: Fri, 25 Aug 2017 13:04:58 +0100
Subject: [PATCH 2/4] NameFix

---
 .../java/org/parabot/randoms/pkhonor/CombatStone     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/parabot/randoms/pkhonor/CombatStone b/src/main/java/org/parabot/randoms/pkhonor/CombatStone
index 0fbabc1..0d34029 100644
--- a/src/main/java/org/parabot/randoms/pkhonor/CombatStone
+++ b/src/main/java/org/parabot/randoms/pkhonor/CombatStone
@@ -9,7 +9,7 @@ import org.rev317.min.api.methods.Players;
 import org.rev317.min.api.wrappers.Npc;
 
 /**
- * @author Updated Lord
+ * @author Lord
  */
 public class CombatStone implements Random {
 
@@ -18,7 +18,7 @@ public class CombatStone implements Random {
 
     @Override
     public boolean activate() {
-        this.combat = getLady();
+        this.combat = getCombat();
         return this.combat != null;
     }
 
@@ -36,10 +36,10 @@ public class CombatStone implements Random {
         }
     }
 
-    private Npc getLady() {
-        for (Npc lady : Npcs.getNearest(id)) {
-            if (lady != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) {
-                return lady;
+    private Npc getCombat() {
+        for (Npc combat : Npcs.getNearest(id)) {
+            if (combat != null && combat.getInteractingCharacter().equals(Players.getMyPlayer())) {
+                return combat;
             }
         }
 

From 8e6723b407e44e84dfa51762e4a5b08746eac25e Mon Sep 17 00:00:00 2001
From: PBLord <PBLord@users.noreply.github.com>
Date: Fri, 25 Aug 2017 14:19:36 +0100
Subject: [PATCH 3/4] Update CombatStone

---
 src/main/java/org/parabot/randoms/pkhonor/CombatStone | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/parabot/randoms/pkhonor/CombatStone b/src/main/java/org/parabot/randoms/pkhonor/CombatStone
index 0d34029..73191bc 100644
--- a/src/main/java/org/parabot/randoms/pkhonor/CombatStone
+++ b/src/main/java/org/parabot/randoms/pkhonor/CombatStone
@@ -18,8 +18,7 @@ public class CombatStone implements Random {
 
     @Override
     public boolean activate() {
-        this.combat = getCombat();
-        return this.combat != null;
+        return (this.combat = getCombat) != null;
     }
 
     @Override

From 25d8db5c94117316bd79a14aabaf8ee7d071253d Mon Sep 17 00:00:00 2001
From: PBLord <PBLord@users.noreply.github.com>
Date: Fri, 25 Aug 2017 15:07:27 +0100
Subject: [PATCH 4/4] [FIX] Logger

---
 src/main/java/org/parabot/randoms/pkhonor/CombatStone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/parabot/randoms/pkhonor/CombatStone b/src/main/java/org/parabot/randoms/pkhonor/CombatStone
index 73191bc..ed4232c 100644
--- a/src/main/java/org/parabot/randoms/pkhonor/CombatStone
+++ b/src/main/java/org/parabot/randoms/pkhonor/CombatStone
@@ -23,7 +23,7 @@ public class CombatStone implements Random {
 
     @Override
     public void execute() {
-        System.out.println("Running CombatStone");
+        Logger.addMessage("CombatStone Random Running",true);
         if (this.combat != null) {
             combat.interact(Npcs.Option.TALK_TO);
             Time.sleep(new SleepCondition() {