From 9b846c314da966c9baba4f4a2f7e5b3d2424721b Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 28 Apr 2025 06:50:02 +0300 Subject: [PATCH] refactored IAction.scheduleAfter and scheduleBefore to just after and before --- src/api | 2 +- .../java/noppes/npcs/scripted/ScriptedActionManager.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/api b/src/api index c3e21bf8c..0a2697242 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit c3e21bf8c215e603eb0a2d995ab9f67dd79c31a7 +Subproject commit 0a2697242063d4f33021cfed554e092592017f5f diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index c5711110d..e4e354a89 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -273,15 +273,19 @@ public class ScriptedActionManager implements IActionManager { } @Override - public void scheduleAfter(IAction after) { + public IAction after(IAction after) { int idx = getIndex(this); if (idx >= 0) scheduleActionAt(idx + 1, after); + return after; } + + @Override - public void scheduleBefore(IAction before) { + public IAction before(IAction before) { int idx = getIndex(this); if (idx >= 0) scheduleActionAt(Math.max(0, idx), before); + return before; } private final java.util.Map dataStore = new java.util.HashMap<>();