Skip to content

Commit

Permalink
cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Jun 28, 2018
1 parent 458b064 commit 2d62b44
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion plugin/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java
View file
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/InjectCommand.java
View file
Expand Up @@ -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")) {
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java
View file
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RunCommand.java
View file
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java
View file
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptContainer.java
View file
Expand Up @@ -163,7 +163,7 @@ public boolean runAllowedHelpProcedure(dPlayer player, dNPC npc, Map<String, dOb
// Add the reqId to each of the entries for the determine command
List<ScriptEntry> 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) {
Expand All @@ -179,7 +179,7 @@ public List<String> runTabCompleteProcedure(dPlayer player, dNPC npc, Map<String
// Add the reqId to each of the entries for the determine command
List<ScriptEntry> 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) {
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/net/aufdemrand/denizen/scripts/containers/core/InventoryScriptContainer.java
View file
Expand Up @@ -209,7 +209,7 @@ else if (dItem.matches(item)) {
List<ScriptEntry> 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);
Expand Down

0 comments on commit 2d62b44

Please sign in to comment.