From 0e8db79605f8c134090e6500789ae999449ab635 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 22:34:38 +0300 Subject: [PATCH] Fixed IConditional's task firing with latency after code that must come after it due to thread delegation --- .../data/action/ConditionalAction.java | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java index d1ee784ad..71a3df76b 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -57,31 +57,27 @@ public class ConditionalAction extends Action implements IConditionalAction { } if (ticksExisted % updateEveryXTick == 0) { - if (condition != null && condition.apply(this)) { - if (isThreaded) - actionThread.execute("task", this::executeTask); - else - executeTask(); - } - - if (isTerminated()) { - if (onTermination != null) { - if (isThreaded) - actionThread.execute("onTermination", this::executeOnTermination); - else - executeOnTermination(); - } - markDone(); - return; - } - checkCount++; + + Runnable execute = () -> { + if (condition != null && condition.apply(this)) + executeTask(); + + if (isTerminated()) { + if (onTermination != null) + executeOnTermination(); + markDone(); + } + }; + + if (isThreaded) + actionThread.execute("task", execute); + else + execute.run(); } - if (maxCount > -1 && count >= maxCount) { + if (maxCount > -1 && count >= maxCount) markDone(); - return; - } duration++; }