ymo/DreambotScripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename KittenTask singleton instantiator and fix NPE

Browse Source
This commit is contained in:
Yuri Moens 2021-10-19 23:48:06 +02:00
parent eededcb580
commit cd6ec994fd
Signed by: ymo
GPG Key ID: F6D51D6FE15BE924
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CAgility/src/io/reisub/dreambot/cagility/CAgility.java
View File

@ -11,7 +11,7 @@ import io.reisub.dreambot.util.tasks.kitten.KittenTask;
import org.dreambot.api.methods.skills.Skill; import org.dreambot.api.methods.skills.Skill;
import org.dreambot.api.script.Category; import org.dreambot.api.script.Category;
import org.dreambot.api.script.ScriptManifest; import org.dreambot.api.script.ScriptManifest;
import org.dreambot.api.utilities.Timer; import org.dreambot.api.script.TaskNode;
import java.awt.*; import java.awt.*;
@ -25,9 +25,13 @@ public class CAgility extends CTaskScript {
getUI().addSkills(Skill.AGILITY); getUI().addSkills(Skill.AGILITY);
getUI().setCustomLines(1); getUI().setCustomLines(1);
TaskNode kittenTask = KittenTask.getInstance();
if (kittenTask != null) {
addNodes(kittenTask);
}
addNodes( addNodes(
new Eat(), new Eat(),
KittenTask.createKittenTask(),
new TurnOnRun(), new TurnOnRun(),
new HandleObstacle(HandleObstacle.Course.SEERS), new HandleObstacle(HandleObstacle.Course.SEERS),
new PickupMark() new PickupMark()

2
CFisher/src/io/reisub/dreambot/cfisher/CFisher.java
View File

@ -18,7 +18,7 @@ public class CFisher extends TaskScript {
public void onStart() { public void onStart() {
getRandomManager().registerSolver(new GenieSolver(GenieSolver.Skill.HERBLORE)); getRandomManager().registerSolver(new GenieSolver(GenieSolver.Skill.HERBLORE));
TaskNode kittenTask = KittenTask.createKittenTask(); TaskNode kittenTask = KittenTask.getInstance();
if (kittenTask != null) { if (kittenTask != null) {
addNodes(kittenTask); addNodes(kittenTask);
} }

2
Util/src/io/reisub/dreambot/util/tasks/kitten/KittenTask.java
View File

@ -30,7 +30,7 @@ public class KittenTask extends TaskNodeParent {
}; };
@Nullable @Nullable
public static KittenTask createKittenTask() { public static KittenTask getInstance() {
KittenTask task = null; KittenTask task = null;
if (Inventory.contains(Constants.KITTEN_INVENTORY)) { if (Inventory.contains(Constants.KITTEN_INVENTORY)) {