From 6762af55059d2730aaf28717415abec1d43cfc8c Mon Sep 17 00:00:00 2001
From: bigguy345 <monkeybar3200@gmail.com>
Date: Mon, 28 Apr 2025 08:36:26 +0300
Subject: [PATCH] Fixed cancelAction method

---
 .../npcs/scripted/ScriptedActionManager.java      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
index 42c57c9dd..702aaf412 100644
--- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
+++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java
@@ -122,9 +122,20 @@ public class ScriptedActionManager implements IActionManager {
 
     @Override
     public boolean cancelAction(String name) {
-        for (IAction act : actionQueue) {
+        Iterator<IAction> acts = actionQueue.iterator();
+        while (acts.hasNext()) {
+            IAction act = acts.next();
             if (act.getName().equals(name)) {
-                ((LinkedList<IAction>) actionQueue).remove(act);
+                acts.remove();
+                return true;
+            }
+        }
+
+        Iterator<IConditionalAction> cons = conditionalActions.iterator();
+        while (cons.hasNext()) {
+            IConditionalAction con = cons.next();
+            if (con.getName().equals(name)) {
+                cons.remove();
                 return true;
             }
         }