diff --git a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java index d34d77eee8..9cb091933b 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java @@ -299,7 +299,7 @@ public String getAttribute(Attribute attribute) { if (attribute.startsWith("name")) return new Element(ChatColor.stripColor(getName())) .getAttribute(attribute.fulfill(1)); - + // <--[tag] // @attribute // @returns dList @@ -312,7 +312,7 @@ public String getAttribute(Attribute attribute) { list.add(trait.getName()); return new dList(list).getAttribute(attribute.fulfill(1)); } - + // <--[tag] // @attribute ]> // @returns Element(boolean) diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java index cc829f6b60..ceadbca8eb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java @@ -53,10 +53,10 @@ public LinkedHashMap> getBracedCommands(ScriptEnt // Loop through the arguments of each entry List argList = aH.interpret(entry.getArguments()); - + // Set the variable to use for naming braced command lists; the first should be the command name String bracesName = scriptEntry.getCommandName(); - + for (int i = startArg; i < argList.size(); i++) { aH.Argument arg = argList.get(i); if (hyperdebug) dB.echoDebug("Arg found: " + arg.raw_value); @@ -124,7 +124,7 @@ else if (arg.matches("-") && bracesEntered == 1) { newCommand = true; if (hyperdebug) dB.echoDebug("Assuming following is a new command"); } - + // Add to the name of the braced command list else if (bracesEntered == 0) { bracesName += arg.raw_value; @@ -140,7 +140,7 @@ else if (bracesEntered == 0) { scriptEntry.getResidingQueue().removeEntry(0); return bracedSections; - + } } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java index e0774b78af..84ded2cef8 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java @@ -46,7 +46,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("braces", getBracedCommands(scriptEntry, 0)); break; } - + else if (!scriptEntry.hasObject("possibilities") && arg.matchesPrimitive(aH.PrimitiveType.Integer)) scriptEntry.addObject("possibilities", arg.asElement()); @@ -76,7 +76,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { int possibilities = 0; ScriptQueue queue = scriptEntry.getResidingQueue(); ArrayList bracedCommands = null; - + if (!scriptEntry.hasObject("braces")) { possibilities = scriptEntry.getElement("possibilities").asInt(); } @@ -90,9 +90,9 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { dB.echoDebug("...random number generator selected '%s'", String.valueOf(selected + 1)); if (bracedCommands == null) { - + ScriptEntry keeping = null; - + for (int x = 0; x < possibilities; x++) { if (x != selected) { diff --git a/src/main/java/net/aufdemrand/denizen/utilities/packets/PacketHelper.java b/src/main/java/net/aufdemrand/denizen/utilities/packets/PacketHelper.java index 182a9856bb..e8559b1212 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/packets/PacketHelper.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/packets/PacketHelper.java @@ -20,7 +20,7 @@ public PacketHelper(Denizen denizen) { public static NameplateHandler getNameplateHandler() { return npHandler; } - + public static InvisibleLoreHandler getInvisibleLoreHandler() { return ilHandler; } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/packets/handler/InvisibleLoreHandler.java b/src/main/java/net/aufdemrand/denizen/utilities/packets/handler/InvisibleLoreHandler.java index 6c915c9220..6e18f2e83f 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/packets/handler/InvisibleLoreHandler.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/packets/handler/InvisibleLoreHandler.java @@ -31,7 +31,7 @@ import com.comphenix.protocol.wrappers.nbt.NbtType; public class InvisibleLoreHandler { - + public Denizen denizen; public ProtocolManager protocolManager; @@ -48,7 +48,7 @@ public void registerListeners() { public void onPacketSending(PacketEvent event) { PacketContainer packet = event.getPacket(); try { - + switch (packet.getID()) { case 0x67: @@ -64,9 +64,9 @@ public void onPacketSending(PacketEvent event) { encodeLore(smArray.read(i)); } break; - + } - + } catch (FieldAccessException ex) {} } @@ -145,7 +145,7 @@ public ItemStack[] encodeLore(ItemStack[] stacks) { } return stacks; } - + public ItemStack encodeLore(ItemStack stack) { if (stack != null) { if (stack.hasItemMeta() && stack.getItemMeta().hasLore()) {