From cd6ec994fdebc9d1a23b903bbfeab7b02ead0783 Mon Sep 17 00:00:00 2001
From: Yuri Moens <yuri.moens@gmail.com>
Date: Tue, 19 Oct 2021 23:48:06 +0200
Subject: [PATCH] Rename KittenTask singleton instantiator and fix NPE

---
 CAgility/src/io/reisub/dreambot/cagility/CAgility.java    | 8 ++++++--
 CFisher/src/io/reisub/dreambot/cfisher/CFisher.java       | 2 +-
 .../io/reisub/dreambot/util/tasks/kitten/KittenTask.java  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CAgility/src/io/reisub/dreambot/cagility/CAgility.java b/CAgility/src/io/reisub/dreambot/cagility/CAgility.java
index 7459b5c..f8662b5 100644
--- a/CAgility/src/io/reisub/dreambot/cagility/CAgility.java
+++ b/CAgility/src/io/reisub/dreambot/cagility/CAgility.java
@@ -11,7 +11,7 @@ import io.reisub.dreambot.util.tasks.kitten.KittenTask;
 import org.dreambot.api.methods.skills.Skill;
 import org.dreambot.api.script.Category;
 import org.dreambot.api.script.ScriptManifest;
-import org.dreambot.api.utilities.Timer;
+import org.dreambot.api.script.TaskNode;
 
 import java.awt.*;
 
@@ -25,9 +25,13 @@ public class CAgility extends CTaskScript {
         getUI().addSkills(Skill.AGILITY);
         getUI().setCustomLines(1);
 
+        TaskNode kittenTask = KittenTask.getInstance();
+        if (kittenTask != null) {
+            addNodes(kittenTask);
+        }
+
         addNodes(
                 new Eat(),
-                KittenTask.createKittenTask(),
                 new TurnOnRun(),
                 new HandleObstacle(HandleObstacle.Course.SEERS),
                 new PickupMark()
diff --git a/CFisher/src/io/reisub/dreambot/cfisher/CFisher.java b/CFisher/src/io/reisub/dreambot/cfisher/CFisher.java
index db5317a..20141ac 100644
--- a/CFisher/src/io/reisub/dreambot/cfisher/CFisher.java
+++ b/CFisher/src/io/reisub/dreambot/cfisher/CFisher.java
@@ -18,7 +18,7 @@ public class CFisher extends TaskScript {
     public void onStart() {
         getRandomManager().registerSolver(new GenieSolver(GenieSolver.Skill.HERBLORE));
 
-        TaskNode kittenTask = KittenTask.createKittenTask();
+        TaskNode kittenTask = KittenTask.getInstance();
         if (kittenTask != null) {
             addNodes(kittenTask);
         }
diff --git a/Util/src/io/reisub/dreambot/util/tasks/kitten/KittenTask.java b/Util/src/io/reisub/dreambot/util/tasks/kitten/KittenTask.java
index 4379261..329e237 100644
--- a/Util/src/io/reisub/dreambot/util/tasks/kitten/KittenTask.java
+++ b/Util/src/io/reisub/dreambot/util/tasks/kitten/KittenTask.java
@@ -30,7 +30,7 @@ public class KittenTask extends TaskNodeParent {
     };
 
     @Nullable
-    public static KittenTask createKittenTask() {
+    public static KittenTask getInstance() {
         KittenTask task = null;
 
         if (Inventory.contains(Constants.KITTEN_INVENTORY)) {