diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index f61ddb6cd..20244d56a 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -115,7 +115,7 @@ public class Action implements IAction { @Override public IAction setMaxDuration(int x) { - this.maxDuration = x; + this.maxDuration = Math.max(-1, x); return this; } @@ -158,7 +158,7 @@ public class Action implements IAction { @Override public IAction setUpdateEveryXTick(int x) { - this.updateEveryXTick = x; + this.updateEveryXTick = Math.max(1, x); return this; } @@ -226,6 +226,13 @@ public class Action implements IAction { return this; } + + @Override + public IAction start() { + manager.start(); + return this; + } + @Override public IAction getNext() { boolean seenMe = false; diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index f76fcbc0d..9d17e3b30 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -105,6 +105,15 @@ public class ScriptedActionManager implements IActionManager { return action; } + @Override + public IAction scheduleAction(String name, Consumer task) { + return scheduleAction(create(name, task)); + } + @Override + public IAction scheduleAction(String name, int startAfterTicks, Consumer task) { + return scheduleAction(create(name, startAfterTicks, task)); + } + @Override public IAction scheduleAction(String name, int maxDuration, int startAfterTicks, Consumer task) { return scheduleAction(create(name, maxDuration, startAfterTicks, task));