From 2d62b44533aaf3c94f9694831553ba557b8b2c47 Mon Sep 17 00:00:00 2001 From: mcmonkey Date: Thu, 28 Jun 2018 03:50:56 -0700 Subject: [PATCH] cleaning --- .../net/aufdemrand/denizen/npc/actions/ActionHandler.java | 2 +- .../denizen/scripts/commands/core/InjectCommand.java | 2 +- .../denizen/scripts/commands/core/RepeatCommand.java | 4 ++-- .../aufdemrand/denizen/scripts/commands/core/RunCommand.java | 2 +- .../denizen/scripts/commands/core/WhileCommand.java | 4 ++-- .../scripts/containers/core/CommandScriptContainer.java | 4 ++-- .../scripts/containers/core/InventoryScriptContainer.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugin/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java b/plugin/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java index 0a39b780ec..ef53e13ea6 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java @@ -67,7 +67,7 @@ public String doAction(String actionName, dNPC npc, dPlayer player, AssignmentSc long id = DetermineCommand.getNewId(); // Add the reqId to each of the entries for the determine command - ScriptBuilder.addObjectToEntries(script, "ReqId", id); + ScriptBuilder.addObjectToEntries(script, "reqid", id); dB.echoDebug(assignment, DebugElement.Header, "Building action 'On " + actionName.toUpperCase() + "' for " + npc.toString()); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java index 9b1dc3af9d..dc30dd73a3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java @@ -176,7 +176,7 @@ else if (scriptEntry.hasObject("path")) { } // For determine - ScriptBuilder.addObjectToEntries(entries, "ReqId", scriptEntry.getObject("reqid")); + ScriptBuilder.addObjectToEntries(entries, "reqid", scriptEntry.getObject("reqid")); // If 'instantly' was specified, run the commands immediately. if (scriptEntry.hasObject("instant")) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java index 8e483c5bba..3a9ab2a0e6 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java @@ -151,7 +151,7 @@ else if (callback != null && callback.asBoolean()) { bracedCommands.add(callbackEntry); for (int i = 0; i < bracedCommands.size(); i++) { bracedCommands.get(i).setInstant(true); - bracedCommands.get(i).addObject("reqId", scriptEntry.getObject("reqid")); + bracedCommands.get(i).addObject("reqid", scriptEntry.getObject("reqid")); } scriptEntry.getResidingQueue().injectEntries(bracedCommands, 0); } @@ -203,7 +203,7 @@ else if (callback != null && callback.asBoolean()) { scriptEntry.getResidingQueue().addDefinition("value", "1"); for (int i = 0; i < bracedCommandsList.size(); i++) { bracedCommandsList.get(i).setInstant(true); - bracedCommandsList.get(i).addObject("reqId", scriptEntry.getObject("reqid")); + bracedCommandsList.get(i).addObject("reqid", scriptEntry.getObject("reqid")); } scriptEntry.setInstant(true); scriptEntry.getResidingQueue().injectEntries(bracedCommandsList, 0); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java index 996b96203c..a3fd490437 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java @@ -276,7 +276,7 @@ public void run() { queue.setReqId(reqId); // Also add the reqId to each of the entries for reasons - ScriptBuilder.addObjectToEntries(entries, "ReqId", reqId); + ScriptBuilder.addObjectToEntries(entries, "reqid", reqId); // Save the queue for script referencing scriptEntry.addObject("created_queue", queue); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java index c6f19cfed0..0421ff0f40 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java @@ -162,7 +162,7 @@ else if (callback != null && callback.asBoolean()) { bracedCommands.add(callbackEntry); for (int i = 0; i < bracedCommands.size(); i++) { bracedCommands.get(i).setInstant(true); - bracedCommands.get(i).addObject("reqId", scriptEntry.getObject("reqid")); + bracedCommands.get(i).addObject("reqid", scriptEntry.getObject("reqid")); } scriptEntry.getResidingQueue().injectEntries(bracedCommands, 0); } @@ -216,7 +216,7 @@ else if (callback != null && callback.asBoolean()) { scriptEntry.getResidingQueue().addDefinition("loop_index", "1"); for (int i = 0; i < bracedCommandsList.size(); i++) { bracedCommandsList.get(i).setInstant(true); - bracedCommandsList.get(i).addObject("reqId", scriptEntry.getObject("reqid")); + bracedCommandsList.get(i).addObject("reqid", scriptEntry.getObject("reqid")); } scriptEntry.setInstant(true); scriptEntry.getResidingQueue().injectEntries(bracedCommandsList, 0); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptContainer.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptContainer.java index 65b8ae48a0..b75ce7fa59 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptContainer.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptContainer.java @@ -163,7 +163,7 @@ public boolean runAllowedHelpProcedure(dPlayer player, dNPC npc, Map entries = getEntries(new BukkitScriptEntryData(player, npc), "ALLOWED HELP"); long id = DetermineCommand.getNewId(); - ScriptBuilder.addObjectToEntries(entries, "ReqId", id); + ScriptBuilder.addObjectToEntries(entries, "reqid", id); ScriptQueue queue = InstantQueue.getQueue(ScriptQueue.getNextId(getName())).setReqId(id).addEntries(entries); if (context != null) { @@ -179,7 +179,7 @@ public List runTabCompleteProcedure(dPlayer player, dNPC npc, Map entries = getEntries(new BukkitScriptEntryData(player, npc), "TAB COMPLETE"); long id = DetermineCommand.getNewId(); - ScriptBuilder.addObjectToEntries(entries, "ReqId", id); + ScriptBuilder.addObjectToEntries(entries, "reqid", id); ScriptQueue queue = InstantQueue.getQueue(ScriptQueue.getNextId(getName())).setReqId(id).addEntries(entries); if (context != null) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java index e4a5341f3a..efe62c2e95 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java @@ -209,7 +209,7 @@ else if (dItem.matches(item)) { List entries = getEntries(new BukkitScriptEntryData(player, npc), "PROCEDURAL ITEMS"); if (!entries.isEmpty()) { long id = DetermineCommand.getNewId(); - ScriptBuilder.addObjectToEntries(entries, "ReqId", id); + ScriptBuilder.addObjectToEntries(entries, "reqid", id); InstantQueue queue = InstantQueue.getQueue(ScriptQueue.getNextId("INV_SCRIPT_ITEM_PROC")); queue.addEntries(entries); queue.setReqId(id);