From 191645ca3ac0319641ea0e3e1eb9f42020b85f8c Mon Sep 17 00:00:00 2001
From: Fryslan <pietjetse@outlook.com>
Date: Fri, 10 Jun 2016 21:51:20 +0200
Subject: [PATCH] [NAMING] Fixed Naming in BobsRandom and Jail classes.

---
 .../parabot/randoms/pkhonor/BobsIsland.java   | 10 +++++-----
 .../org/parabot/randoms/pkhonor/Jail.java     | 20 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java
index dd1bd38..91c878a 100755
--- a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java
+++ b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java
@@ -19,20 +19,20 @@ import java.util.ArrayList;
  */
 public class BobsIsland implements Random {
 
-    private static final Tile CENTER = new Tile(2525,4777);
-    private static final int PORTAL_ID = 8987;
+    private static final Tile center = new Tile(2525,4777);
+    private static final int portal_id = 8987;
 
     public BobsIsland() {
     }
 
     @Override
     public boolean activate() {
-        return CENTER.distanceTo() < 25;
+        return center.distanceTo() < 25;
     }
 
     @Override
     public void execute() {
-        SceneObject[] portals = SceneObjects.getNearest(PORTAL_ID);
+        SceneObject[] portals = SceneObjects.getNearest(portal_id);
 
         for(final SceneObject portal : portals){
             if(portal != null){
@@ -45,7 +45,7 @@ public class BobsIsland implements Random {
                 }, 10000);
                 Time.sleep(1000);
 
-                if(CENTER.distanceTo() > 24){
+                if(center.distanceTo() > 24){
                     break;
                 }
             }
diff --git a/src/main/java/org/parabot/randoms/pkhonor/Jail.java b/src/main/java/org/parabot/randoms/pkhonor/Jail.java
index c8b6836..17ba13d 100755
--- a/src/main/java/org/parabot/randoms/pkhonor/Jail.java
+++ b/src/main/java/org/parabot/randoms/pkhonor/Jail.java
@@ -16,14 +16,14 @@ import org.rev317.min.api.wrappers.SceneObject;
 
 public class Jail implements Random {
     private Npc jailer;
-    private final int[] ROCKS = {2093, 2092};
-    private final int[] PICK_AXES = {1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608};
+    private final int[] rocks = {2093, 2092};
+    private final int[] pick_axes = {1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608};
 
     @Override
     public boolean activate() {
         try {
-            if (jailer() != null) {
-                this.jailer = jailer();
+            if (getJailer() != null) {
+                this.jailer = getJailer();
                 return true;
             }
             return false;
@@ -36,10 +36,10 @@ public class Jail implements Random {
     public void execute() {
         try {
 
-            SceneObject rock = rock();
+            SceneObject rock = getRock();
 
             //Check if we got an Pickaxe
-            if (Inventory.getCount(PICK_AXES) > 0) {
+            if (Inventory.getCount(pick_axes) > 0) {
 
                 //Check if we can min the ores
                 if (!Inventory.isFull()) {
@@ -84,17 +84,17 @@ public class Jail implements Random {
         }
     }
 
-    private Npc jailer(){
+    private Npc getJailer(){
         for(Npc jailer : Npcs.getNearest(201)){
-            if(jailer != null){
+            if(jailer != null && jailer.getDef() != null){
                 return jailer;
             }
         }
         return null;
     }
 
-    private SceneObject rock(){
-        for(SceneObject rock : SceneObjects.getNearest(ROCKS)){
+    private SceneObject getRock(){
+        for(SceneObject rock : SceneObjects.getNearest(rocks)){
             if(rock != null){
                 return rock;
             }