update to match recent core cleanup

DenizenScript · Oct 31, 2021 · 1e8c245 · 1e8c245
1 parent 637c20c
commit 1e8c245
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/actions/ActionHandler.java b/plugin/src/main/java/com/denizenscript/denizen/npc/actions/ActionHandler.java
@@ -56,7 +56,8 @@ public String doAction(String actionName, NPCTag npc, PlayerTag player, Assignme
                 "Building action 'On " + actionName.toUpperCase() + "' for " + npc.toString());
 
         // Add entries and context to the queue
-        ScriptQueue queue = new InstantQueue(assignment.getName()).addEntries(script);
+        ScriptQueue queue = new InstantQueue(assignment.getName());
+        queue.addEntries(script);
 
         ContextSource.SimpleMap src = new ContextSource.SimpleMap();
         src.contexts = context;

diff --git a/...c/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptContainer.java b/...c/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptContainer.java
@@ -204,7 +204,8 @@ public String getPermissionMessage() {
     }
 
     public ScriptQueue runCommandScript(PlayerTag player, NPCTag npc, Map<String, ObjectTag> context) {
-        ScriptQueue queue = new InstantQueue(getName()).addEntries(getBaseEntries(new BukkitScriptEntryData(player, npc)));
+        ScriptQueue queue = new InstantQueue(getName());
+        queue.addEntries(getBaseEntries(new BukkitScriptEntryData(player, npc)));
         if (context != null) {
             ContextSource.SimpleMap src = new ContextSource.SimpleMap();
             src.contexts = context;
@@ -217,7 +218,8 @@ public ScriptQueue runCommandScript(PlayerTag player, NPCTag npc, Map<String, Ob
     public boolean runAllowedHelpProcedure(PlayerTag player, NPCTag npc, Map<String, ObjectTag> context) {
         List<ScriptEntry> entries = getEntries(new BukkitScriptEntryData(player, npc), "allowed help");
 
-        ScriptQueue queue = new InstantQueue(getName()).addEntries(entries);
+        ScriptQueue queue = new InstantQueue(getName());
+        queue.addEntries(entries);
         if (context != null) {
             ContextSource.SimpleMap src = new ContextSource.SimpleMap();
             src.contexts = context;
@@ -254,7 +256,8 @@ public List<String> runTabCompleteProcedure(PlayerTag player, NPCTag npc, Map<St
         }
         if (hasProcStyleTabComplete) {
             List<ScriptEntry> entries = getEntries(new BukkitScriptEntryData(player, npc), "tab complete");
-            ScriptQueue queue = new InstantQueue(getName()).addEntries(entries);
+            ScriptQueue queue = new InstantQueue(getName());
+            queue.addEntries(entries);
             if (contextSrc != null) {
                 queue.setContextSource(contextSrc);
             }