Skip to content

Commit

Permalink
Formatting again!
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmonkey4eva committed Sep 20, 2013
1 parent 47b961e commit e315576
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/objects/dNPC.java
Expand Up @@ -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 <npc.list_traits>
// @returns dList
Expand All @@ -312,7 +312,7 @@ public String getAttribute(Attribute attribute) {
list.add(trait.getName());
return new dList(list).getAttribute(attribute.fulfill(1));
}

// <--[tag]
// @attribute <npc.has_trait[<trait>]>
// @returns Element(boolean)
Expand Down
Expand Up @@ -53,10 +53,10 @@ public LinkedHashMap<String, ArrayList<ScriptEntry>> getBracedCommands(ScriptEnt

// Loop through the arguments of each entry
List<aH.Argument> 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);
Expand Down Expand Up @@ -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;
Expand All @@ -140,7 +140,7 @@ else if (bracesEntered == 0) {

scriptEntry.getResidingQueue().removeEntry(0);
return bracedSections;

}

}
Expand Up @@ -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());
Expand Down Expand Up @@ -76,7 +76,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
int possibilities = 0;
ScriptQueue queue = scriptEntry.getResidingQueue();
ArrayList<ScriptEntry> bracedCommands = null;

if (!scriptEntry.hasObject("braces")) {
possibilities = scriptEntry.getElement("possibilities").asInt();
}
Expand All @@ -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) {
Expand Down
Expand Up @@ -20,7 +20,7 @@ public PacketHelper(Denizen denizen) {
public static NameplateHandler getNameplateHandler() {
return npHandler;
}

public static InvisibleLoreHandler getInvisibleLoreHandler() {
return ilHandler;
}
Expand Down
Expand Up @@ -31,7 +31,7 @@
import com.comphenix.protocol.wrappers.nbt.NbtType;

public class InvisibleLoreHandler {

public Denizen denizen;
public ProtocolManager protocolManager;

Expand All @@ -48,7 +48,7 @@ public void registerListeners() {
public void onPacketSending(PacketEvent event) {
PacketContainer packet = event.getPacket();
try {

switch (packet.getID()) {

case 0x67:
Expand All @@ -64,9 +64,9 @@ public void onPacketSending(PacketEvent event) {
encodeLore(smArray.read(i));
}
break;

}

} catch (FieldAccessException ex) {}
}

Expand Down Expand Up @@ -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()) {
Expand Down

0 comments on commit e315576

Please sign in to comment.