diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index fd13b4e88..3f0b50b0d 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -421,22 +421,37 @@ public class ScriptedActionManager implements IActionManager { private class ConditionalAction extends ActionBase implements IConditionalAction { private final Supplier predicate; private Supplier terminate; - private final int maxChecks; + private int maxChecks = -1; private int checkCount = 0; - public ConditionalAction(String name, - int checkIntervalTicks, - Supplier predicate, - Consumer task, - int maxChecks) { - super(name, 0, task); - this.predicate = predicate; - this.updateEveryXTick = checkIntervalTicks; + public ConditionalAction(Supplier predicate, Consumer task) { + super(task); + this.predicate = predicate; + } + + public ConditionalAction(String name, Supplier predicate, Consumer task) { + super(name, task); + this.predicate = predicate; + } + + public ConditionalAction(Supplier predicate, Supplier terminate, Consumer task) { + this(predicate, task); + this.terminate = terminate; + } + + public ConditionalAction(String name, Supplier predicate, Supplier terminate, Consumer task) { + this(name, predicate, task); + this.terminate = terminate; + } + + public ConditionalAction(String name, int updateEveryXTick, Supplier predicate, Consumer task, int maxChecks) { + this(name, predicate, task); + this.updateEveryXTick = updateEveryXTick; this.maxChecks = maxChecks; } - public ConditionalAction(String name, int checkIntervalTicks, Supplier predicate, Supplier terminate, Consumer task, int maxChecks) { - this(name, checkIntervalTicks, predicate, task, maxChecks); + public ConditionalAction(String name, int updateEveryXTick, Supplier predicate, Supplier terminate, Consumer task, int maxChecks) { + this(name, updateEveryXTick, predicate, task, maxChecks); this.terminate = terminate; }