diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java index 1eea41719..32cdf131b 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java @@ -10,8 +10,7 @@ public final class ByteArrayTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public ByteArrayTag(final byte[] value) { super(); @@ -21,10 +20,8 @@ public final class ByteArrayTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public ByteArrayTag(final String name, final byte[] value) { super(name); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java index 15e355dfc..8e2ad5638 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java @@ -10,8 +10,7 @@ public final class ByteTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public ByteTag(final byte value) { super(); @@ -21,10 +20,8 @@ public final class ByteTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public ByteTag(final String name, final byte value) { super(name); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java index d4b65590b..a8d0b052b 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java @@ -15,8 +15,7 @@ public final class CompoundTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public CompoundTag(final Map value) { super(); @@ -26,10 +25,8 @@ public final class CompoundTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public CompoundTag(final String name, final Map value) { super(name); @@ -39,8 +36,8 @@ public final class CompoundTag extends Tag { /** * Returns whether this compound tag contains the given key. * - * @param key - * the given key + * @param key the given key + * * @return true if the tag contains the given key */ public boolean containsKey(final String key) { @@ -55,8 +52,8 @@ public final class CompoundTag extends Tag { /** * Return a new compound tag with the given values. * - * @param value - * the value + * @param value the value + * * @return the new compound tag */ public CompoundTag setValue(final Map value) { @@ -73,82 +70,62 @@ public final class CompoundTag extends Tag { } /** - * Get a byte array named with the given key. - *

- *

- * If the key does not exist or its value is not a byte array tag, then an - * empty byte array will be returned. - *

+ * Get a byte array named with the given key.

If the key does not exist or its value is not a byte array + * tag, then an empty byte array will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a byte array */ public byte[] getByteArray(final String key) { final Tag tag = this.value.get(key); if (tag instanceof ByteArrayTag) { return ((ByteArrayTag) tag).getValue(); - } - else { + } else { return new byte[0]; } } /** - * Get a byte named with the given key. - *

- *

- * If the key does not exist or its value is not a byte tag, then {@code 0} - * will be returned. - *

+ * Get a byte named with the given key.

If the key does not exist or its value is not a byte tag, then + * {@code 0} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a byte */ public byte getByte(final String key) { final Tag tag = this.value.get(key); if (tag instanceof ByteTag) { return ((ByteTag) tag).getValue(); - } - else { + } else { return (byte) 0; } } /** - * Get a double named with the given key. - *

- *

- * If the key does not exist or its value is not a double tag, then - * {@code 0} will be returned. - *

+ * Get a double named with the given key.

If the key does not exist or its value is not a double tag, then + * {@code 0} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a double */ public double getDouble(final String key) { final Tag tag = this.value.get(key); if (tag instanceof DoubleTag) { return ((DoubleTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get a double named with the given key, even if it's another - * type of number. - *

- *

- * If the key does not exist or its value is not a number, then {@code 0} - * will be returned. - *

+ * Get a double named with the given key, even if it's another type of number.

If the key does not exist or + * its value is not a number, then {@code 0} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a double */ public double asDouble(final String key) { @@ -156,109 +133,83 @@ public final class CompoundTag extends Tag { if (tag instanceof ByteTag) { return ((ByteTag) tag).getValue(); - } - else if (tag instanceof ShortTag) { + } else if (tag instanceof ShortTag) { return ((ShortTag) tag).getValue(); - } - else if (tag instanceof IntTag) { + } else if (tag instanceof IntTag) { return ((IntTag) tag).getValue(); - } - else if (tag instanceof LongTag) { + } else if (tag instanceof LongTag) { return ((LongTag) tag).getValue(); - } - else if (tag instanceof FloatTag) { + } else if (tag instanceof FloatTag) { return ((FloatTag) tag).getValue(); - } - else if (tag instanceof DoubleTag) { + } else if (tag instanceof DoubleTag) { return ((DoubleTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get a float named with the given key. - *

- *

- * If the key does not exist or its value is not a float tag, then {@code 0} - * will be returned. - *

+ * Get a float named with the given key.

If the key does not exist or its value is not a float tag, then + * {@code 0} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a float */ public float getFloat(final String key) { final Tag tag = this.value.get(key); if (tag instanceof FloatTag) { return ((FloatTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get a {@code int[]} named with the given key. - *

- *

- * If the key does not exist or its value is not an int array tag, then an - * empty array will be returned. - *

+ * Get a {@code int[]} named with the given key.

If the key does not exist or its value is not an int array + * tag, then an empty array will be returned.

+ * + * @param key the key * - * @param key - * the key * @return an int array */ public int[] getIntArray(final String key) { final Tag tag = this.value.get(key); if (tag instanceof IntArrayTag) { return ((IntArrayTag) tag).getValue(); - } - else { + } else { return new int[0]; } } /** - * Get an int named with the given key. - *

- *

- * If the key does not exist or its value is not an int tag, then {@code 0} - * will be returned. - *

+ * Get an int named with the given key.

If the key does not exist or its value is not an int tag, then + * {@code 0} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return an int */ public int getInt(final String key) { final Tag tag = this.value.get(key); if (tag instanceof IntTag) { return ((IntTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get an int named with the given key, even if it's another - * type of number. - *

- *

- * If the key does not exist or its value is not a number, then {@code 0} - * will be returned. - *

+ * Get an int named with the given key, even if it's another type of number.

If the key does not exist or + * its value is not a number, then {@code 0} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return an int */ public int asInt(final String key) { @@ -266,91 +217,69 @@ public final class CompoundTag extends Tag { if (tag instanceof ByteTag) { return ((ByteTag) tag).getValue(); - } - else if (tag instanceof ShortTag) { + } else if (tag instanceof ShortTag) { return ((ShortTag) tag).getValue(); - } - else if (tag instanceof IntTag) { + } else if (tag instanceof IntTag) { return ((IntTag) tag).getValue(); - } - else if (tag instanceof LongTag) { + } else if (tag instanceof LongTag) { return ((LongTag) tag).getValue().intValue(); - } - else if (tag instanceof FloatTag) { + } else if (tag instanceof FloatTag) { return ((FloatTag) tag).getValue().intValue(); - } - else if (tag instanceof DoubleTag) { + } else if (tag instanceof DoubleTag) { return ((DoubleTag) tag).getValue().intValue(); - } - else { + } else { return 0; } } /** - * Get a list of tags named with the given key. - *

- *

- * If the key does not exist or its value is not a list tag, then an empty - * list will be returned. - *

+ * Get a list of tags named with the given key.

If the key does not exist or its value is not a list tag, + * then an empty list will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a list of tags */ public List getList(final String key) { final Tag tag = this.value.get(key); if (tag instanceof ListTag) { return ((ListTag) tag).getValue(); - } - else { + } else { return Collections.emptyList(); } } /** - * Get a {@code TagList} named with the given key. - *

- *

- * If the key does not exist or its value is not a list tag, then an empty - * tag list will be returned. - *

+ * Get a {@code TagList} named with the given key.

If the key does not exist or its value is not a list + * tag, then an empty tag list will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a tag list instance */ public ListTag getListTag(final String key) { final Tag tag = this.value.get(key); if (tag instanceof ListTag) { return (ListTag) tag; - } - else { - return new ListTag(key, StringTag.class, Collections. emptyList()); + } else { + return new ListTag(key, StringTag.class, Collections.emptyList()); } } /** - * Get a list of tags named with the given key. - *

- *

- * If the key does not exist or its value is not a list tag, then an empty - * list will be returned. If the given key references a list but the list of - * of a different type, then an empty list will also be returned. - *

+ * Get a list of tags named with the given key.

If the key does not exist or its value is not a list tag, + * then an empty list will be returned. If the given key references a list but the list of of a different type, then + * an empty list will also be returned.

+ * + * @param key the key + * @param listType the class of the contained type + * @param the type of list * - * @param key - * the key - * @param listType - * the class of the contained type - * @param - * the type of list * @return a list of tags */ @SuppressWarnings("unchecked") @@ -360,49 +289,37 @@ public final class CompoundTag extends Tag { final ListTag listTag = (ListTag) tag; if (listTag.getType().equals(listType)) { return (List) listTag.getValue(); - } - else { + } else { return Collections.emptyList(); } - } - else { + } else { return Collections.emptyList(); } } /** - * Get a long named with the given key. - *

- *

- * If the key does not exist or its value is not a long tag, then {@code 0} - * will be returned. - *

+ * Get a long named with the given key.

If the key does not exist or its value is not a long tag, then + * {@code 0} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a long */ public long getLong(final String key) { final Tag tag = this.value.get(key); if (tag instanceof LongTag) { return ((LongTag) tag).getValue(); - } - else { + } else { return 0L; } } /** - * Get a long named with the given key, even if it's another - * type of number. - *

- *

- * If the key does not exist or its value is not a number, then {@code 0} - * will be returned. - *

+ * Get a long named with the given key, even if it's another type of number.

If the key does not exist or + * its value is not a number, then {@code 0} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a long */ public long asLong(final String key) { @@ -410,72 +327,56 @@ public final class CompoundTag extends Tag { if (tag instanceof ByteTag) { return ((ByteTag) tag).getValue(); - } - else if (tag instanceof ShortTag) { + } else if (tag instanceof ShortTag) { return ((ShortTag) tag).getValue(); - } - else if (tag instanceof IntTag) { + } else if (tag instanceof IntTag) { return ((IntTag) tag).getValue(); - } - else if (tag instanceof LongTag) { + } else if (tag instanceof LongTag) { return ((LongTag) tag).getValue(); - } - else if (tag instanceof FloatTag) { + } else if (tag instanceof FloatTag) { return ((FloatTag) tag).getValue().longValue(); - } - else if (tag instanceof DoubleTag) { + } else if (tag instanceof DoubleTag) { return ((DoubleTag) tag).getValue().longValue(); - } - else { + } else { return 0L; } } /** - * Get a short named with the given key. - *

- *

- * If the key does not exist or its value is not a short tag, then {@code 0} - * will be returned. - *

+ * Get a short named with the given key.

If the key does not exist or its value is not a short tag, then + * {@code 0} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a short */ public short getShort(final String key) { final Tag tag = this.value.get(key); if (tag instanceof ShortTag) { return ((ShortTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get a string named with the given key. - *

- *

- * If the key does not exist or its value is not a string tag, then - * {@code ""} will be returned. - *

+ * Get a string named with the given key.

If the key does not exist or its value is not a string tag, then + * {@code ""} will be returned.

+ * + * @param key the key * - * @param key - * the key * @return a string */ public String getString(final String key) { final Tag tag = this.value.get(key); if (tag instanceof StringTag) { return ((StringTag) tag).getValue(); - } - else { + } else { return ""; } } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java index 184984fc0..0a0e6bd36 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java @@ -1,10 +1,10 @@ package com.intellectualcrafters.jnbt; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.HashMap; import java.util.Map; +import static com.google.common.base.Preconditions.checkNotNull; + /** * Helps create compound tags. */ @@ -22,8 +22,7 @@ public class CompoundTagBuilder { /** * Create a new instance and use the given map (which will be modified). * - * @param value - * the value + * @param value the value */ CompoundTagBuilder(final Map value) { checkNotNull(value); @@ -42,10 +41,9 @@ public class CompoundTagBuilder { /** * Put the given key and tag into the compound tag. * - * @param key - * they key - * @param value - * the value + * @param key they key + * @param value the value + * * @return this object */ public CompoundTagBuilder put(final String key, final Tag value) { @@ -56,13 +54,11 @@ public class CompoundTagBuilder { } /** - * Put the given key and value into the compound tag as a - * {@code ByteArrayTag}. + * Put the given key and value into the compound tag as a {@code ByteArrayTag}. + * + * @param key they key + * @param value the value * - * @param key - * they key - * @param value - * the value * @return this object */ public CompoundTagBuilder putByteArray(final String key, final byte[] value) { @@ -72,10 +68,9 @@ public class CompoundTagBuilder { /** * Put the given key and value into the compound tag as a {@code ByteTag}. * - * @param key - * they key - * @param value - * the value + * @param key they key + * @param value the value + * * @return this object */ public CompoundTagBuilder putByte(final String key, final byte value) { @@ -85,10 +80,9 @@ public class CompoundTagBuilder { /** * Put the given key and value into the compound tag as a {@code DoubleTag}. * - * @param key - * they key - * @param value - * the value + * @param key they key + * @param value the value + * * @return this object */ public CompoundTagBuilder putDouble(final String key, final double value) { @@ -98,10 +92,9 @@ public class CompoundTagBuilder { /** * Put the given key and value into the compound tag as a {@code FloatTag}. * - * @param key - * they key - * @param value - * the value + * @param key they key + * @param value the value + * * @return this object */ public CompoundTagBuilder putFloat(final String key, final float value) { @@ -109,13 +102,11 @@ public class CompoundTagBuilder { } /** - * Put the given key and value into the compound tag as a - * {@code IntArrayTag}. + * Put the given key and value into the compound tag as a {@code IntArrayTag}. + * + * @param key they key + * @param value the value * - * @param key - * they key - * @param value - * the value * @return this object */ public CompoundTagBuilder putIntArray(final String key, final int[] value) { @@ -125,10 +116,9 @@ public class CompoundTagBuilder { /** * Put the given key and value into the compound tag as an {@code IntTag}. * - * @param key - * they key - * @param value - * the value + * @param key they key + * @param value the value + * * @return this object */ public CompoundTagBuilder putInt(final String key, final int value) { @@ -138,10 +128,9 @@ public class CompoundTagBuilder { /** * Put the given key and value into the compound tag as a {@code LongTag}. * - * @param key - * they key - * @param value - * the value + * @param key they key + * @param value the value + * * @return this object */ public CompoundTagBuilder putLong(final String key, final long value) { @@ -151,10 +140,9 @@ public class CompoundTagBuilder { /** * Put the given key and value into the compound tag as a {@code ShortTag}. * - * @param key - * they key - * @param value - * the value + * @param key they key + * @param value the value + * * @return this object */ public CompoundTagBuilder putShort(final String key, final short value) { @@ -164,10 +152,9 @@ public class CompoundTagBuilder { /** * Put the given key and value into the compound tag as a {@code StringTag}. * - * @param key - * they key - * @param value - * the value + * @param key they key + * @param value the value + * * @return this object */ public CompoundTagBuilder putString(final String key, final String value) { @@ -177,8 +164,8 @@ public class CompoundTagBuilder { /** * Put all the entries from the given map into this map. * - * @param value - * the map of tags + * @param value the map of tags + * * @return this object */ public CompoundTagBuilder putAll(final Map value) { @@ -201,8 +188,8 @@ public class CompoundTagBuilder { /** * Build a new compound tag with this builder's entries. * - * @param name - * the name of the tag + * @param name the name of the tag + * * @return the created compound tag */ public CompoundTag build(final String name) { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java index 0477e54c5..2a4c52448 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java @@ -10,8 +10,7 @@ public final class DoubleTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public DoubleTag(final double value) { super(); @@ -21,10 +20,8 @@ public final class DoubleTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public DoubleTag(final String name, final double value) { super(name); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java index 32dbe86ff..a9701340a 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java @@ -10,8 +10,7 @@ public final class FloatTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public FloatTag(final float value) { super(); @@ -21,10 +20,8 @@ public final class FloatTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public FloatTag(final String name, final float value) { super(name); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java index bfca5e264..9439f051b 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java @@ -12,8 +12,7 @@ public final class IntArrayTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public IntArrayTag(final int[] value) { super(); @@ -24,10 +23,8 @@ public final class IntArrayTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public IntArrayTag(final String name, final int[] value) { super(name); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntTag.java index 334e347df..7e5328f37 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/IntTag.java @@ -10,8 +10,7 @@ public final class IntTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public IntTag(final int value) { super(); @@ -21,10 +20,8 @@ public final class IntTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public IntTag(final String name, final int value) { super(name); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTag.java index 615615ead..e4ce732c7 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTag.java @@ -1,12 +1,11 @@ package com.intellectualcrafters.jnbt; -import static com.google.common.base.Preconditions.checkNotNull; - +import javax.annotation.Nullable; import java.util.Collections; import java.util.List; import java.util.NoSuchElementException; -import javax.annotation.Nullable; +import static com.google.common.base.Preconditions.checkNotNull; /** * The {@code TAG_List} tag. @@ -14,15 +13,13 @@ import javax.annotation.Nullable; public final class ListTag extends Tag { private final Class type; - private final List value; + private final List value; /** * Creates the tag with an empty name. * - * @param type - * the type of tag - * @param value - * the value of the tag + * @param type the type of tag + * @param value the value of the tag */ public ListTag(final Class type, final List value) { super(); @@ -34,12 +31,9 @@ public final class ListTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param type - * the type of tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param type the type of tag + * @param value the value of the tag */ public ListTag(final String name, final Class type, final List value) { super(name); @@ -65,8 +59,8 @@ public final class ListTag extends Tag { /** * Create a new list tag with this tag's name and type. * - * @param list - * the new list + * @param list the new list + * * @return a new list tag */ public ListTag setValue(final List list) { @@ -76,97 +70,76 @@ public final class ListTag extends Tag { /** * Get the tag if it exists at the given index. * - * @param index - * the index + * @param index the index + * * @return the tag or null */ @Nullable public Tag getIfExists(final int index) { try { return this.value.get(index); - } - catch (final NoSuchElementException e) { + } catch (final NoSuchElementException e) { return null; } } /** - * Get a byte array named with the given index. - *

- *

- * If the index does not exist or its value is not a byte array tag, then an - * empty byte array will be returned. - *

+ * Get a byte array named with the given index.

If the index does not exist or its value is not a byte + * array tag, then an empty byte array will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a byte array */ public byte[] getByteArray(final int index) { final Tag tag = getIfExists(index); if (tag instanceof ByteArrayTag) { return ((ByteArrayTag) tag).getValue(); - } - else { + } else { return new byte[0]; } } /** - * Get a byte named with the given index. - *

- *

- * If the index does not exist or its value is not a byte tag, then - * {@code 0} will be returned. - *

+ * Get a byte named with the given index.

If the index does not exist or its value is not a byte tag, then + * {@code 0} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a byte */ public byte getByte(final int index) { final Tag tag = getIfExists(index); if (tag instanceof ByteTag) { return ((ByteTag) tag).getValue(); - } - else { + } else { return (byte) 0; } } /** - * Get a double named with the given index. - *

- *

- * If the index does not exist or its value is not a double tag, then - * {@code 0} will be returned. - *

+ * Get a double named with the given index.

If the index does not exist or its value is not a double tag, + * then {@code 0} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a double */ public double getDouble(final int index) { final Tag tag = getIfExists(index); if (tag instanceof DoubleTag) { return ((DoubleTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get a double named with the given index, even if it's another - * type of number. - *

- *

- * If the index does not exist or its value is not a number, then {@code 0} - * will be returned. - *

+ * Get a double named with the given index, even if it's another type of number.

If the index does not + * exist or its value is not a number, then {@code 0} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a double */ public double asDouble(final int index) { @@ -174,109 +147,83 @@ public final class ListTag extends Tag { if (tag instanceof ByteTag) { return ((ByteTag) tag).getValue(); - } - else if (tag instanceof ShortTag) { + } else if (tag instanceof ShortTag) { return ((ShortTag) tag).getValue(); - } - else if (tag instanceof IntTag) { + } else if (tag instanceof IntTag) { return ((IntTag) tag).getValue(); - } - else if (tag instanceof LongTag) { + } else if (tag instanceof LongTag) { return ((LongTag) tag).getValue(); - } - else if (tag instanceof FloatTag) { + } else if (tag instanceof FloatTag) { return ((FloatTag) tag).getValue(); - } - else if (tag instanceof DoubleTag) { + } else if (tag instanceof DoubleTag) { return ((DoubleTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get a float named with the given index. - *

- *

- * If the index does not exist or its value is not a float tag, then - * {@code 0} will be returned. - *

+ * Get a float named with the given index.

If the index does not exist or its value is not a float tag, + * then {@code 0} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a float */ public float getFloat(final int index) { final Tag tag = getIfExists(index); if (tag instanceof FloatTag) { return ((FloatTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get a {@code int[]} named with the given index. - *

- *

- * If the index does not exist or its value is not an int array tag, then an - * empty array will be returned. - *

+ * Get a {@code int[]} named with the given index.

If the index does not exist or its value is not an int + * array tag, then an empty array will be returned.

+ * + * @param index the index * - * @param index - * the index * @return an int array */ public int[] getIntArray(final int index) { final Tag tag = getIfExists(index); if (tag instanceof IntArrayTag) { return ((IntArrayTag) tag).getValue(); - } - else { + } else { return new int[0]; } } /** - * Get an int named with the given index. - *

- *

- * If the index does not exist or its value is not an int tag, then - * {@code 0} will be returned. - *

+ * Get an int named with the given index.

If the index does not exist or its value is not an int tag, then + * {@code 0} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return an int */ public int getInt(final int index) { final Tag tag = getIfExists(index); if (tag instanceof IntTag) { return ((IntTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get an int named with the given index, even if it's another - * type of number. - *

- *

- * If the index does not exist or its value is not a number, then {@code 0} - * will be returned. - *

+ * Get an int named with the given index, even if it's another type of number.

If the index does not exist + * or its value is not a number, then {@code 0} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return an int */ public int asInt(final int index) { @@ -284,91 +231,69 @@ public final class ListTag extends Tag { if (tag instanceof ByteTag) { return ((ByteTag) tag).getValue(); - } - else if (tag instanceof ShortTag) { + } else if (tag instanceof ShortTag) { return ((ShortTag) tag).getValue(); - } - else if (tag instanceof IntTag) { + } else if (tag instanceof IntTag) { return ((IntTag) tag).getValue(); - } - else if (tag instanceof LongTag) { + } else if (tag instanceof LongTag) { return ((LongTag) tag).getValue().intValue(); - } - else if (tag instanceof FloatTag) { + } else if (tag instanceof FloatTag) { return ((FloatTag) tag).getValue().intValue(); - } - else if (tag instanceof DoubleTag) { + } else if (tag instanceof DoubleTag) { return ((DoubleTag) tag).getValue().intValue(); - } - else { + } else { return 0; } } /** - * Get a list of tags named with the given index. - *

- *

- * If the index does not exist or its value is not a list tag, then an empty - * list will be returned. - *

+ * Get a list of tags named with the given index.

If the index does not exist or its value is not a list + * tag, then an empty list will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a list of tags */ public List getList(final int index) { final Tag tag = getIfExists(index); if (tag instanceof ListTag) { return ((ListTag) tag).getValue(); - } - else { + } else { return Collections.emptyList(); } } /** - * Get a {@code TagList} named with the given index. - *

- *

- * If the index does not exist or its value is not a list tag, then an empty - * tag list will be returned. - *

+ * Get a {@code TagList} named with the given index.

If the index does not exist or its value is not a list + * tag, then an empty tag list will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a tag list instance */ public ListTag getListTag(final int index) { final Tag tag = getIfExists(index); if (tag instanceof ListTag) { return (ListTag) tag; - } - else { - return new ListTag(StringTag.class, Collections. emptyList()); + } else { + return new ListTag(StringTag.class, Collections.emptyList()); } } /** - * Get a list of tags named with the given index. - *

- *

- * If the index does not exist or its value is not a list tag, then an empty - * list will be returned. If the given index references a list but the list - * of of a different type, then an empty list will also be returned. - *

+ * Get a list of tags named with the given index.

If the index does not exist or its value is not a list + * tag, then an empty list will be returned. If the given index references a list but the list of of a different + * type, then an empty list will also be returned.

+ * + * @param index the index + * @param listType the class of the contained type + * @param the NBT type * - * @param index - * the index - * @param listType - * the class of the contained type - * @param - * the NBT type * @return a list of tags */ @SuppressWarnings("unchecked") @@ -378,49 +303,37 @@ public final class ListTag extends Tag { final ListTag listTag = (ListTag) tag; if (listTag.getType().equals(listType)) { return (List) listTag.getValue(); - } - else { + } else { return Collections.emptyList(); } - } - else { + } else { return Collections.emptyList(); } } /** - * Get a long named with the given index. - *

- *

- * If the index does not exist or its value is not a long tag, then - * {@code 0} will be returned. - *

+ * Get a long named with the given index.

If the index does not exist or its value is not a long tag, then + * {@code 0} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a long */ public long getLong(final int index) { final Tag tag = getIfExists(index); if (tag instanceof LongTag) { return ((LongTag) tag).getValue(); - } - else { + } else { return 0L; } } /** - * Get a long named with the given index, even if it's another - * type of number. - *

- *

- * If the index does not exist or its value is not a number, then {@code 0} - * will be returned. - *

+ * Get a long named with the given index, even if it's another type of number.

If the index does not exist + * or its value is not a number, then {@code 0} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a long */ public long asLong(final int index) { @@ -428,72 +341,56 @@ public final class ListTag extends Tag { if (tag instanceof ByteTag) { return ((ByteTag) tag).getValue(); - } - else if (tag instanceof ShortTag) { + } else if (tag instanceof ShortTag) { return ((ShortTag) tag).getValue(); - } - else if (tag instanceof IntTag) { + } else if (tag instanceof IntTag) { return ((IntTag) tag).getValue(); - } - else if (tag instanceof LongTag) { + } else if (tag instanceof LongTag) { return ((LongTag) tag).getValue(); - } - else if (tag instanceof FloatTag) { + } else if (tag instanceof FloatTag) { return ((FloatTag) tag).getValue().longValue(); - } - else if (tag instanceof DoubleTag) { + } else if (tag instanceof DoubleTag) { return ((DoubleTag) tag).getValue().longValue(); - } - else { + } else { return 0; } } /** - * Get a short named with the given index. - *

- *

- * If the index does not exist or its value is not a short tag, then - * {@code 0} will be returned. - *

+ * Get a short named with the given index.

If the index does not exist or its value is not a short tag, + * then {@code 0} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a short */ public short getShort(final int index) { final Tag tag = getIfExists(index); if (tag instanceof ShortTag) { return ((ShortTag) tag).getValue(); - } - else { + } else { return 0; } } /** - * Get a string named with the given index. - *

- *

- * If the index does not exist or its value is not a string tag, then - * {@code ""} will be returned. - *

+ * Get a string named with the given index.

If the index does not exist or its value is not a string tag, + * then {@code ""} will be returned.

+ * + * @param index the index * - * @param index - * the index * @return a string */ public String getString(final int index) { final Tag tag = getIfExists(index); if (tag instanceof StringTag) { return ((StringTag) tag).getValue(); - } - else { + } else { return ""; } } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java index 530acbe26..1c1ba5339 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java @@ -1,25 +1,24 @@ package com.intellectualcrafters.jnbt; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import static com.google.common.base.Preconditions.checkNotNull; + /** * Helps create list tags. */ public class ListTagBuilder { private final Class type; - private final List entries; + private final List entries; /** * Create a new instance. * - * @param type - * of tag contained in this list + * @param type of tag contained in this list */ ListTagBuilder(final Class type) { checkNotNull(type); @@ -64,8 +63,8 @@ public class ListTagBuilder { /** * Add the given tag. * - * @param value - * the tag + * @param value the tag + * * @return this object */ public ListTagBuilder add(final Tag value) { @@ -80,8 +79,8 @@ public class ListTagBuilder { /** * Add all the tags in the given list. * - * @param value - * a list of tags + * @param value a list of tags + * * @return this object */ public ListTagBuilder addAll(final Collection value) { @@ -104,8 +103,8 @@ public class ListTagBuilder { /** * Build a new list tag with this builder's entries. * - * @param name - * the name of the tag + * @param name the name of the tag + * * @return the created list tag */ public ListTag build(final String name) { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/LongTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/LongTag.java index 3d1b4f73b..a8d22218c 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/LongTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/LongTag.java @@ -10,8 +10,7 @@ public final class LongTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public LongTag(final long value) { super(); @@ -21,10 +20,8 @@ public final class LongTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public LongTag(final String name, final long value) { super(name); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java index ab043857c..65a13f4ec 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java @@ -30,7 +30,7 @@ public final class NBTConstants { public static final Charset CHARSET = Charset.forName("UTF-8"); - public static final int TYPE_END = 0, TYPE_BYTE = 1, TYPE_SHORT = 2, TYPE_INT = 3, TYPE_LONG = 4, TYPE_FLOAT = 5, TYPE_DOUBLE = 6, TYPE_BYTE_ARRAY = 7, TYPE_STRING = 8, TYPE_LIST = 9, TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11; + public static final int TYPE_END = 0, TYPE_BYTE = 1, TYPE_SHORT = 2, TYPE_INT = 3, TYPE_LONG = 4, TYPE_FLOAT = 5, TYPE_DOUBLE = 6, TYPE_BYTE_ARRAY = 7, TYPE_STRING = 8, TYPE_LIST = 9, TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11; /** * Default private constructor. @@ -42,11 +42,11 @@ public final class NBTConstants { /** * Convert a type ID to its corresponding {@link Tag} class. * - * @param id - * type ID + * @param id type ID + * * @return tag class - * @throws IllegalArgumentException - * thrown if the tag ID is not valid + * + * @throws IllegalArgumentException thrown if the tag ID is not valid */ public static Class getClassFromType(final int id) { switch (id) { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java index 0ad474cbe..7aa319759 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java @@ -10,28 +10,20 @@ import java.util.List; import java.util.Map; /** - * This class reads NBT, or Named Binary Tag - * streams, and produces an object graph of subclasses of the {@code Tag} - * object. - *

- *

- * The NBT format was created by Markus Persson, and the specification may be - * found at - * http://www.minecraft.net/docs/NBT.txt. - *

+ * This class reads NBT, or Named Binary Tag streams, and produces an object graph of + * subclasses of the {@code Tag} object.

The NBT format was created by Markus Persson, and the specification + * may be found at http://www.minecraft.net/docs/NBT.txt.

*/ public final class NBTInputStream implements Closeable { private final DataInputStream is; /** - * Creates a new {@code NBTInputStream}, which will source its data - * from the specified input stream. + * Creates a new {@code NBTInputStream}, which will source its data from the specified input stream. * - * @param is - * the input stream - * @throws IOException - * if an I/O error occurs + * @param is the input stream + * + * @throws IOException if an I/O error occurs */ public NBTInputStream(final InputStream is) throws IOException { this.is = new DataInputStream(is); @@ -41,8 +33,8 @@ public final class NBTInputStream implements Closeable { * Reads an NBT tag from the stream. * * @return The tag that was read. - * @throws IOException - * if an I/O error occurs. + * + * @throws IOException if an I/O error occurs. */ public Tag readTag() throws IOException { return readTag(0); @@ -51,11 +43,11 @@ public final class NBTInputStream implements Closeable { /** * Reads an NBT from the stream. * - * @param depth - * the depth of this tag + * @param depth the depth of this tag + * * @return The tag that was read. - * @throws IOException - * if an I/O error occurs. + * + * @throws IOException if an I/O error occurs. */ private Tag readTag(final int depth) throws IOException { final int type = this.is.readByte() & 0xFF; @@ -66,8 +58,7 @@ public final class NBTInputStream implements Closeable { final byte[] nameBytes = new byte[nameLength]; this.is.readFully(nameBytes); name = new String(nameBytes, NBTConstants.CHARSET); - } - else { + } else { name = ""; } @@ -77,23 +68,20 @@ public final class NBTInputStream implements Closeable { /** * Reads the payload of a tag, given the name and type. * - * @param type - * the type - * @param name - * the name - * @param depth - * the depth + * @param type the type + * @param name the name + * @param depth the depth + * * @return the tag - * @throws IOException - * if an I/O error occurs. + * + * @throws IOException if an I/O error occurs. */ private Tag readTagPayload(final int type, final String name, final int depth) throws IOException { switch (type) { case NBTConstants.TYPE_END: if (depth == 0) { throw new IOException("TAG_End found without a TAG_Compound/TAG_List tag preceding it."); - } - else { + } else { return new EndTag(); } case NBTConstants.TYPE_BYTE: @@ -138,8 +126,7 @@ public final class NBTInputStream implements Closeable { final Tag tag = readTag(depth + 1); if (tag instanceof EndTag) { break; - } - else { + } else { tagMap.put(tag.getName(), tag); } } diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java index 1506c2a93..65e3426e5 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java @@ -28,15 +28,9 @@ import java.io.OutputStream; import java.util.List; /** - *

- * This class writes NBT, or Named Binary Tag - * Tag objects to an underlying OutputStream. - *

- *

- *

- * The NBT format was created by Markus Persson, and the specification may be - * found at - * http://www.minecraft.net/docs/NBT.txt. + *

This class writes NBT, or Named Binary Tag Tag objects to an + * underlying OutputStream.

The NBT format was created by Markus Persson, and the + * specification may be found at http://www.minecraft.net/docs/NBT.txt. *

* * @author Graham Edgecombe @@ -49,13 +43,11 @@ public final class NBTOutputStream implements Closeable { private final DataOutputStream os; /** - * Creates a new NBTOutputStream, which will write data to the - * specified underlying output stream. + * Creates a new NBTOutputStream, which will write data to the specified underlying output stream. * - * @param os - * The output stream. - * @throws IOException - * if an I/O error occurs. + * @param os The output stream. + * + * @throws IOException if an I/O error occurs. */ public NBTOutputStream(final OutputStream os) throws IOException { this.os = new DataOutputStream(os); @@ -64,10 +56,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a tag. * - * @param tag - * The tag to write. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag to write. + * + * @throws IOException if an I/O error occurs. */ public void writeTag(final Tag tag) throws IOException { final int type = NBTUtils.getTypeCode(tag.getClass()); @@ -88,10 +79,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes tag payload. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeTagPayload(final Tag tag) throws IOException { final int type = NBTUtils.getTypeCode(tag.getClass()); @@ -140,10 +130,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_Byte tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeByteTagPayload(final ByteTag tag) throws IOException { this.os.writeByte(tag.getValue()); @@ -152,10 +141,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_Byte_Array tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeByteArrayTagPayload(final ByteArrayTag tag) throws IOException { final byte[] bytes = tag.getValue(); @@ -166,10 +154,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_Compound tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeCompoundTagPayload(final CompoundTag tag) throws IOException { for (final Tag childTag : tag.getValue().values()) { @@ -181,10 +168,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_List tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeListTagPayload(final ListTag tag) throws IOException { final Class clazz = tag.getType(); @@ -201,10 +187,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_String tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeStringTagPayload(final StringTag tag) throws IOException { final byte[] bytes = tag.getValue().getBytes(NBTConstants.CHARSET); @@ -215,10 +200,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_Double tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeDoubleTagPayload(final DoubleTag tag) throws IOException { this.os.writeDouble(tag.getValue()); @@ -227,10 +211,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_Float tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeFloatTagPayload(final FloatTag tag) throws IOException { this.os.writeFloat(tag.getValue()); @@ -239,10 +222,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_Long tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeLongTagPayload(final LongTag tag) throws IOException { this.os.writeLong(tag.getValue()); @@ -251,10 +233,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_Int tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeIntTagPayload(final IntTag tag) throws IOException { this.os.writeInt(tag.getValue()); @@ -263,10 +244,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_Short tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeShortTagPayload(final ShortTag tag) throws IOException { this.os.writeShort(tag.getValue()); @@ -275,10 +255,9 @@ public final class NBTOutputStream implements Closeable { /** * Writes a TAG_Empty tag. * - * @param tag - * The tag. - * @throws IOException - * if an I/O error occurs. + * @param tag The tag. + * + * @throws IOException if an I/O error occurs. */ private void writeEndTagPayload(final EndTag tag) { /* empty */ diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java index 44a014c20..fb7b85698 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java @@ -16,48 +16,36 @@ public final class NBTUtils { /** * Gets the type name of a tag. * - * @param clazz - * the tag class + * @param clazz the tag class + * * @return The type name. */ public static String getTypeName(final Class clazz) { if (clazz.equals(ByteArrayTag.class)) { return "TAG_Byte_Array"; - } - else if (clazz.equals(ByteTag.class)) { + } else if (clazz.equals(ByteTag.class)) { return "TAG_Byte"; - } - else if (clazz.equals(CompoundTag.class)) { + } else if (clazz.equals(CompoundTag.class)) { return "TAG_Compound"; - } - else if (clazz.equals(DoubleTag.class)) { + } else if (clazz.equals(DoubleTag.class)) { return "TAG_Double"; - } - else if (clazz.equals(EndTag.class)) { + } else if (clazz.equals(EndTag.class)) { return "TAG_End"; - } - else if (clazz.equals(FloatTag.class)) { + } else if (clazz.equals(FloatTag.class)) { return "TAG_Float"; - } - else if (clazz.equals(IntTag.class)) { + } else if (clazz.equals(IntTag.class)) { return "TAG_Int"; - } - else if (clazz.equals(ListTag.class)) { + } else if (clazz.equals(ListTag.class)) { return "TAG_List"; - } - else if (clazz.equals(LongTag.class)) { + } else if (clazz.equals(LongTag.class)) { return "TAG_Long"; - } - else if (clazz.equals(ShortTag.class)) { + } else if (clazz.equals(ShortTag.class)) { return "TAG_Short"; - } - else if (clazz.equals(StringTag.class)) { + } else if (clazz.equals(StringTag.class)) { return "TAG_String"; - } - else if (clazz.equals(IntArrayTag.class)) { + } else if (clazz.equals(IntArrayTag.class)) { return "TAG_Int_Array"; - } - else { + } else { throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ")."); } } @@ -65,50 +53,38 @@ public final class NBTUtils { /** * Gets the type code of a tag class. * - * @param clazz - * the tag class + * @param clazz the tag class + * * @return The type code. - * @throws IllegalArgumentException - * if the tag class is invalid. + * + * @throws IllegalArgumentException if the tag class is invalid. */ public static int getTypeCode(final Class clazz) { if (clazz.equals(ByteArrayTag.class)) { return NBTConstants.TYPE_BYTE_ARRAY; - } - else if (clazz.equals(ByteTag.class)) { + } else if (clazz.equals(ByteTag.class)) { return NBTConstants.TYPE_BYTE; - } - else if (clazz.equals(CompoundTag.class)) { + } else if (clazz.equals(CompoundTag.class)) { return NBTConstants.TYPE_COMPOUND; - } - else if (clazz.equals(DoubleTag.class)) { + } else if (clazz.equals(DoubleTag.class)) { return NBTConstants.TYPE_DOUBLE; - } - else if (clazz.equals(EndTag.class)) { + } else if (clazz.equals(EndTag.class)) { return NBTConstants.TYPE_END; - } - else if (clazz.equals(FloatTag.class)) { + } else if (clazz.equals(FloatTag.class)) { return NBTConstants.TYPE_FLOAT; - } - else if (clazz.equals(IntTag.class)) { + } else if (clazz.equals(IntTag.class)) { return NBTConstants.TYPE_INT; - } - else if (clazz.equals(ListTag.class)) { + } else if (clazz.equals(ListTag.class)) { return NBTConstants.TYPE_LIST; - } - else if (clazz.equals(LongTag.class)) { + } else if (clazz.equals(LongTag.class)) { return NBTConstants.TYPE_LONG; - } - else if (clazz.equals(ShortTag.class)) { + } else if (clazz.equals(ShortTag.class)) { return NBTConstants.TYPE_SHORT; - } - else if (clazz.equals(StringTag.class)) { + } else if (clazz.equals(StringTag.class)) { return NBTConstants.TYPE_STRING; - } - else if (clazz.equals(IntArrayTag.class)) { + } else if (clazz.equals(IntArrayTag.class)) { return NBTConstants.TYPE_INT_ARRAY; - } - else { + } else { throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ")."); } } @@ -116,11 +92,11 @@ public final class NBTUtils { /** * Gets the class of a type of tag. * - * @param type - * the type + * @param type the type + * * @return The class. - * @throws IllegalArgumentException - * if the tag type is invalid. + * + * @throws IllegalArgumentException if the tag type is invalid. */ public static Class getTypeClass(final int type) { switch (type) { @@ -156,12 +132,10 @@ public final class NBTUtils { /** * Get child tag of a NBT structure. * - * @param items - * the map to read from - * @param key - * the key to look for - * @param expected - * the expected NBT class type + * @param items the map to read from + * @param key the key to look for + * @param expected the expected NBT class type + * * @return child tag */ public static T getChildTag(final Map items, final String key, final Class expected) throws IllegalArgumentException { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java index c2976b6ff..b4fb7e2a8 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java @@ -31,8 +31,7 @@ public final class ShortTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public ShortTag(final short value) { super(); @@ -42,10 +41,8 @@ public final class ShortTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public ShortTag(final String name, final short value) { super(name); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/StringTag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/StringTag.java index 05069471a..708331cec 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/StringTag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/StringTag.java @@ -12,8 +12,7 @@ public final class StringTag extends Tag { /** * Creates the tag with an empty name. * - * @param value - * the value of the tag + * @param value the value of the tag */ public StringTag(final String value) { super(); @@ -24,10 +23,8 @@ public final class StringTag extends Tag { /** * Creates the tag. * - * @param name - * the name of the tag - * @param value - * the value of the tag + * @param name the name of the tag + * @param value the value of the tag */ public StringTag(final String name, final String value) { super(name); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/Tag.java b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/Tag.java index af13d6249..aa060c18e 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/Tag.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/jnbt/Tag.java @@ -38,8 +38,7 @@ public abstract class Tag { /** * Creates the tag with the specified name. * - * @param name - * the name + * @param name the name */ Tag(String name) { if (name == null) { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/CDL.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/CDL.java index da59e4763..7e2f3f847 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/json/CDL.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/CDL.java @@ -1,21 +1,18 @@ package com.intellectualcrafters.json; /** - * This provides static methods to convert comma delimited text into a - * JSONArray, and to covert a JSONArray into comma delimited text. Comma - * delimited text is a very popular format for data interchange. It is - * understood by most database, spreadsheet, and organizer programs. + * This provides static methods to convert comma delimited text into a JSONArray, and to covert a JSONArray into comma + * delimited text. Comma delimited text is a very popular format for data interchange. It is understood by most + * database, spreadsheet, and organizer programs. *

- * Each row of text represents a row in a table or a data record. Each row ends - * with a NEWLINE character. Each row contains one or more values. Values are - * separated by commas. A value can contain any character except for comma, + * Each row of text represents a row in a table or a data record. Each row ends with a NEWLINE character. Each row + * contains one or more values. Values are separated by commas. A value can contain any character except for comma, * unless is is wrapped in single quotes or double quotes. *

* The first row usually contains the names of the columns. *

- * A comma delimited list can be converted into a JSONArray of JSONObjects. The - * names for the elements in the JSONObjects can be taken from the names in the - * first row. + * A comma delimited list can be converted into a JSONArray of JSONObjects. The names for the elements in the + * JSONObjects can be taken from the names in the first row. * * @author JSON.org * @version 2014-05-03 @@ -23,14 +20,13 @@ package com.intellectualcrafters.json; public class CDL { /** - * Get the next value. The value can be wrapped in quotes. The value can - * be empty. + * Get the next value. The value can be wrapped in quotes. The value can be empty. + * + * @param x A JSONTokener of the source text. * - * @param x - * A JSONTokener of the source text. * @return The value string, or null if empty. - * @throws JSONException - * if the quoted string is badly formed. + * + * @throws JSONException if the quoted string is badly formed. */ private static String getValue(final JSONTokener x) throws JSONException { char c; @@ -38,8 +34,7 @@ public class CDL { StringBuffer sb; do { c = x.next(); - } - while ((c == ' ') || (c == '\t')); + } while ((c == ' ') || (c == '\t')); switch (c) { case 0: return null; @@ -47,7 +42,7 @@ public class CDL { case '\'': q = c; sb = new StringBuffer(); - for (;;) { + for (; ; ) { c = x.next(); if (c == q) { break; @@ -70,21 +65,22 @@ public class CDL { /** * Produce a JSONArray of strings from a row of comma delimited values. * - * @param x - * A JSONTokener of the source text. + * @param x A JSONTokener of the source text. + * * @return A JSONArray of strings. + * * @throws JSONException */ public static JSONArray rowToJSONArray(final JSONTokener x) throws JSONException { final JSONArray ja = new JSONArray(); - for (;;) { + for (; ; ) { final String value = getValue(x); char c = x.next(); if ((value == null) || ((ja.length() == 0) && (value.length() == 0) && (c != ','))) { return null; } ja.put(value); - for (;;) { + for (; ; ) { if (c == ',') { break; } @@ -100,17 +96,15 @@ public class CDL { } /** - * Produce a JSONObject from a row of comma delimited text, using a - * parallel JSONArray of strings to provides the names of the elements. + * Produce a JSONObject from a row of comma delimited text, using a parallel JSONArray of strings to provides the + * names of the elements. + * + * @param names A JSONArray of names. This is commonly obtained from the first row of a comma delimited text file + * using the rowToJSONArray method. + * @param x A JSONTokener of the source text. * - * @param names - * A JSONArray of names. This is commonly obtained from the - * first row of a comma delimited text file using the - * rowToJSONArray - * method. - * @param x - * A JSONTokener of the source text. * @return A JSONObject combining the names and values. + * * @throws JSONException */ public static JSONObject rowToJSONObject(final JSONArray names, final JSONTokener x) throws JSONException { @@ -119,12 +113,11 @@ public class CDL { } /** - * Produce a comma delimited text row from a JSONArray. Values containing - * the comma character will be quoted. Troublesome characters may be - * removed. + * Produce a comma delimited text row from a JSONArray. Values containing the comma character will be quoted. + * Troublesome characters may be removed. + * + * @param ja A JSONArray of strings. * - * @param ja - * A JSONArray of strings. * @return A string ending in NEWLINE. */ public static String rowToString(final JSONArray ja) { @@ -146,8 +139,7 @@ public class CDL { } } sb.append('"'); - } - else { + } else { sb.append(string); } } @@ -157,12 +149,12 @@ public class CDL { } /** - * Produce a JSONArray of JSONObjects from a comma delimited text string, - * using the first row as a source of names. + * Produce a JSONArray of JSONObjects from a comma delimited text string, using the first row as a source of names. + * + * @param string The comma delimited text. * - * @param string - * The comma delimited text. * @return A JSONArray of JSONObjects. + * * @throws JSONException */ public static JSONArray toJSONArray(final String string) throws JSONException { @@ -170,12 +162,12 @@ public class CDL { } /** - * Produce a JSONArray of JSONObjects from a comma delimited text string, - * using the first row as a source of names. + * Produce a JSONArray of JSONObjects from a comma delimited text string, using the first row as a source of names. + * + * @param x The JSONTokener containing the comma delimited text. * - * @param x - * The JSONTokener containing the comma delimited text. * @return A JSONArray of JSONObjects. + * * @throws JSONException */ public static JSONArray toJSONArray(final JSONTokener x) throws JSONException { @@ -183,14 +175,14 @@ public class CDL { } /** - * Produce a JSONArray of JSONObjects from a comma delimited text string - * using a supplied JSONArray as the source of element names. + * Produce a JSONArray of JSONObjects from a comma delimited text string using a supplied JSONArray as the source of + * element names. + * + * @param names A JSONArray of strings. + * @param string The comma delimited text. * - * @param names - * A JSONArray of strings. - * @param string - * The comma delimited text. * @return A JSONArray of JSONObjects. + * * @throws JSONException */ public static JSONArray toJSONArray(final JSONArray names, final String string) throws JSONException { @@ -198,14 +190,14 @@ public class CDL { } /** - * Produce a JSONArray of JSONObjects from a comma delimited text string - * using a supplied JSONArray as the source of element names. + * Produce a JSONArray of JSONObjects from a comma delimited text string using a supplied JSONArray as the source of + * element names. + * + * @param names A JSONArray of strings. + * @param x A JSONTokener of the source text. * - * @param names - * A JSONArray of strings. - * @param x - * A JSONTokener of the source text. * @return A JSONArray of JSONObjects. + * * @throws JSONException */ public static JSONArray toJSONArray(final JSONArray names, final JSONTokener x) throws JSONException { @@ -213,7 +205,7 @@ public class CDL { return null; } final JSONArray ja = new JSONArray(); - for (;;) { + for (; ; ) { final JSONObject jo = rowToJSONObject(names, x); if (jo == null) { break; @@ -227,13 +219,13 @@ public class CDL { } /** - * Produce a comma delimited text from a JSONArray of JSONObjects. The - * first row will be a list of names obtained by inspecting the first - * JSONObject. + * Produce a comma delimited text from a JSONArray of JSONObjects. The first row will be a list of names obtained by + * inspecting the first JSONObject. + * + * @param ja A JSONArray of JSONObjects. * - * @param ja - * A JSONArray of JSONObjects. * @return A comma delimited text. + * * @throws JSONException */ public static String toString(final JSONArray ja) throws JSONException { @@ -248,15 +240,14 @@ public class CDL { } /** - * Produce a comma delimited text from a JSONArray of JSONObjects using - * a provided list of names. The list of names is not included in the - * output. + * Produce a comma delimited text from a JSONArray of JSONObjects using a provided list of names. The list of names + * is not included in the output. + * + * @param names A JSONArray of strings. + * @param ja A JSONArray of JSONObjects. * - * @param names - * A JSONArray of strings. - * @param ja - * A JSONArray of JSONObjects. * @return A comma delimited text. + * * @throws JSONException */ public static String toString(final JSONArray names, final JSONArray ja) throws JSONException { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/Cookie.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/Cookie.java index 8bfa065fe..b5efcbd2d 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/json/Cookie.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/Cookie.java @@ -22,8 +22,8 @@ package com.intellectualcrafters.json; /** - * Convert a web browser cookie specification to a JSONObject and back. - * JSON and Cookies are both notations for name/value pairs. + * Convert a web browser cookie specification to a JSONObject and back. JSON and Cookies are both notations for + * name/value pairs. * * @author JSON.org * @version 2014-05-03 @@ -31,17 +31,14 @@ package com.intellectualcrafters.json; public class Cookie { /** - * Produce a copy of a string in which the characters '+', '%', '=', ';' - * and control characters are replaced with "%hh". This is a gentle form - * of URL encoding, attempting to cause as little distortion to the - * string as possible. The characters '=' and ';' are meta characters in - * cookies. By convention, they are escaped using the URL-encoding. This is - * only a convention, not a standard. Often, cookies are expected to have - * encoded values. We encode '=' and ';' because we must. We encode '%' and - * '+' because they are meta characters in URL encoding. + * Produce a copy of a string in which the characters '+', '%', '=', ';' and control characters are replaced with + * "%hh". This is a gentle form of URL encoding, attempting to cause as little distortion to the string as possible. + * The characters '=' and ';' are meta characters in cookies. By convention, they are escaped using the + * URL-encoding. This is only a convention, not a standard. Often, cookies are expected to have encoded values. We + * encode '=' and ';' because we must. We encode '%' and '+' because they are meta characters in URL encoding. + * + * @param string The source string. * - * @param string - * The source string. * @return The escaped result. */ public static String escape(final String string) { @@ -55,8 +52,7 @@ public class Cookie { sb.append('%'); sb.append(Character.forDigit((char) ((c >>> 4) & 0x0f), 16)); sb.append(Character.forDigit((char) (c & 0x0f), 16)); - } - else { + } else { sb.append(c); } } @@ -64,20 +60,17 @@ public class Cookie { } /** - * Convert a cookie specification string into a JSONObject. The string - * will contain a name value pair separated by '='. The name and the value - * will be unescaped, possibly converting '+' and '%' sequences. The - * cookie properties may follow, separated by ';', also represented as - * name=value (except the secure property, which does not have a value). - * The name will be stored under the key "name", and the value will be - * stored under the key "value". This method does not do checking or - * validation of the parameters. It only converts the cookie string into - * a JSONObject. + * Convert a cookie specification string into a JSONObject. The string will contain a name value pair separated by + * '='. The name and the value will be unescaped, possibly converting '+' and '%' sequences. The cookie properties + * may follow, separated by ';', also represented as name=value (except the secure property, which does not have a + * value). The name will be stored under the key "name", and the value will be stored under the key "value". This + * method does not do checking or validation of the parameters. It only converts the cookie string into a + * JSONObject. + * + * @param string The cookie specification string. + * + * @return A JSONObject containing "name", "value", and possibly other members. * - * @param string - * The cookie specification string. - * @return A JSONObject containing "name", "value", and possibly other - * members. * @throws JSONException */ public static JSONObject toJSONObject(final String string) throws JSONException { @@ -94,12 +87,10 @@ public class Cookie { if (x.next() != '=') { if (name.equals("secure")) { value = Boolean.TRUE; - } - else { + } else { throw x.syntaxError("Missing '=' in cookie parameter."); } - } - else { + } else { value = unescape(x.nextTo(';')); x.next(); } @@ -109,15 +100,14 @@ public class Cookie { } /** - * Convert a JSONObject into a cookie specification string. The JSONObject - * must contain "name" and "value" members. - * If the JSONObject contains "expires", "domain", "path", or "secure" - * members, they will be appended to the cookie specification string. - * All other members are ignored. + * Convert a JSONObject into a cookie specification string. The JSONObject must contain "name" and "value" members. + * If the JSONObject contains "expires", "domain", "path", or "secure" members, they will be appended to the cookie + * specification string. All other members are ignored. + * + * @param jo A JSONObject * - * @param jo - * A JSONObject * @return A cookie specification string + * * @throws JSONException */ public static String toString(final JSONObject jo) throws JSONException { @@ -145,13 +135,11 @@ public class Cookie { } /** - * Convert %hh sequences to single characters, and - * convert plus to space. + * Convert %hh sequences to single characters, and convert plus to space. + * + * @param string A string that may contain +  (plus) and %hh + * sequences. * - * @param string - * A string that may contain + - *  (plus) and %hh - * sequences. * @return The unescaped string. */ public static String unescape(final String string) { @@ -161,8 +149,7 @@ public class Cookie { char c = string.charAt(i); if (c == '+') { c = ' '; - } - else if ((c == '%') && ((i + 2) < length)) { + } else if ((c == '%') && ((i + 2) < length)) { final int d = JSONTokener.dehexchar(string.charAt(i + 1)); final int e = JSONTokener.dehexchar(string.charAt(i + 2)); if ((d >= 0) && (e >= 0)) { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/CookieList.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/CookieList.java index 9bebbf660..99437329f 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/json/CookieList.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/CookieList.java @@ -11,18 +11,17 @@ import java.util.Iterator; public class CookieList { /** - * Convert a cookie list into a JSONObject. A cookie list is a sequence - * of name/value pairs. The names are separated from the values by '='. - * The pairs are separated by ';'. The names and the values - * will be unescaped, possibly converting '+' and '%' sequences. + * Convert a cookie list into a JSONObject. A cookie list is a sequence of name/value pairs. The names are separated + * from the values by '='. The pairs are separated by ';'. The names and the values will be unescaped, possibly + * converting '+' and '%' sequences. *

- * To add a cookie to a cooklist, - * cookielistJSONObject.put(cookieJSONObject.getString("name"), + * To add a cookie to a cooklist, cookielistJSONObject.put(cookieJSONObject.getString("name"), * cookieJSONObject.getString("value")); * - * @param string - * A cookie list string + * @param string A cookie list string + * * @return A JSONObject + * * @throws JSONException */ public static JSONObject toJSONObject(final String string) throws JSONException { @@ -38,14 +37,14 @@ public class CookieList { } /** - * Convert a JSONObject into a cookie list. A cookie list is a sequence - * of name/value pairs. The names are separated from the values by '='. - * The pairs are separated by ';'. The characters '%', '+', '=', and ';' - * in the names and values are replaced by "%hh". + * Convert a JSONObject into a cookie list. A cookie list is a sequence of name/value pairs. The names are separated + * from the values by '='. The pairs are separated by ';'. The characters '%', '+', '=', and ';' in the names and + * values are replaced by "%hh". + * + * @param jo A JSONObject * - * @param jo - * A JSONObject * @return A cookie list string + * * @throws JSONException */ public static String toString(final JSONObject jo) throws JSONException { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTP.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTP.java index cbab17d8b..786fbf38e 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTP.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTP.java @@ -37,10 +37,10 @@ public class HTTP { public static final String CRLF = "\r\n"; /** - * Convert an HTTP header string into a JSONObject. It can be a request - * header or a response header. A request header will contain + * Convert an HTTP header string into a JSONObject. It can be a request header or a response header. A request + * header will contain + *

*

- * * 

      * {
      *    Method: "POST" (for example),
@@ -51,7 +51,7 @@ public class HTTP {
      * 

      * A response header will contain
      * 

-     *
+     * 

      * 
      * {
      *    "HTTP-Version": "HTTP/1.1" (for example),
@@ -60,10 +60,10 @@ public class HTTP {
      * }
      * 

      * 

-     * In addition, the other parameters in the header will be captured, using
-     * the HTTP field names as JSON names, so that
+     * In addition, the other parameters in the header will be captured, using the HTTP field names as JSON names, so
+     * that
+     * 

      * 

-     *
      * 
      *    Date: Sun, 26 May 2002 18:06:04 GMT
      *    Cookie: Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s
@@ -72,7 +72,7 @@ public class HTTP {
      * 

      * become
      * 

-     *
+     * 

      * 
      * {...
      *    Date: "Sun, 26 May 2002 18:06:04 GMT",
@@ -81,13 +81,12 @@ public class HTTP {
      * ...}
      * 

      * 

-     * It does no further checking or conversion. It does not parse dates. It
-     * does not do '%' transforms on URLs.
+     * It does no further checking or conversion. It does not parse dates. It does not do '%' transforms on URLs.
+     *
+     * @param string An HTTP header string.
+     *
+     * @return A JSONObject containing the elements and attributes of the XML string.
      *
-     * @param string
-     *            An HTTP header string.
-     * @return A JSONObject containing the elements and attributes
-     *         of the XML string.
      * @throws JSONException
      */
     public static JSONObject toJSONObject(final String string) throws JSONException {
@@ -105,8 +104,7 @@ public class HTTP {
             jo.put("Reason-Phrase", x.nextTo('\0'));
             x.next();
 
-        }
-        else {
+        } else {
 
             // Request
 
@@ -129,7 +127,7 @@ public class HTTP {
     /**
      * Convert a JSONObject into an HTTP header. A request header must contain
      * 

-     *
+     * 

      * 
      * {
      *    Method: "POST" (for example),
@@ -140,7 +138,7 @@ public class HTTP {
      * 

      * A response header must contain
      * 

-     *
+     * 

      * 
      * {
      *    "HTTP-Version": "HTTP/1.1" (for example),
@@ -149,15 +147,13 @@ public class HTTP {
      * }
      * 

      * 

-     * Any other members of the JSONObject will be output as HTTP fields. The
-     * result will end with two CRLF pairs.
+     * Any other members of the JSONObject will be output as HTTP fields. The result will end with two CRLF pairs.
+     *
+     * @param jo A JSONObject
      *
-     * @param jo
-     *            A JSONObject
      * @return An HTTP header string.
-     * @throws JSONException
-     *             if the object does not contain enough
-     *             information.
+     *
+     * @throws JSONException if the object does not contain enough information.
      */
     public static String toString(final JSONObject jo) throws JSONException {
         final Iterator keys = jo.keys();
@@ -169,8 +165,7 @@ public class HTTP {
             sb.append(jo.getString("Status-Code"));
             sb.append(' ');
             sb.append(jo.getString("Reason-Phrase"));
-        }
-        else if (jo.has("Method") && jo.has("Request-URI")) {
+        } else if (jo.has("Method") && jo.has("Request-URI")) {
             sb.append(jo.getString("Method"));
             sb.append(' ');
             sb.append('"');
@@ -178,8 +173,7 @@ public class HTTP {
             sb.append('"');
             sb.append(' ');
             sb.append(jo.getString("HTTP-Version"));
-        }
-        else {
+        } else {
             throw new JSONException("Not enough material for an HTTP header.");
         }
         sb.append(CRLF);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTPTokener.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTPTokener.java
index 85039fb6a..09cc1af60 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTPTokener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/HTTPTokener.java
@@ -1,8 +1,7 @@
 package com.intellectualcrafters.json;
 
 /**
- * The HTTPTokener extends the JSONTokener to provide additional methods
- * for the parsing of HTTP headers.
+ * The HTTPTokener extends the JSONTokener to provide additional methods for the parsing of HTTP headers.
  *
  * @author JSON.org
  * @version 2014-05-03
@@ -12,8 +11,7 @@ public class HTTPTokener extends JSONTokener {
     /**
      * Construct an HTTPTokener from a string.
      *
-     * @param string
-     *            A source string.
+     * @param string A source string.
      */
     public HTTPTokener(final String string) {
         super(string);
@@ -23,6 +21,7 @@ public class HTTPTokener extends JSONTokener {
      * Get the next token or string. This is used in parsing HTTP headers.
      *
      * @return A String.
+     *
      * @throws JSONException
      */
     public String nextToken() throws JSONException {
@@ -31,11 +30,10 @@ public class HTTPTokener extends JSONTokener {
         final StringBuilder sb = new StringBuilder();
         do {
             c = next();
-        }
-        while (Character.isWhitespace(c));
+        } while (Character.isWhitespace(c));
         if ((c == '"') || (c == '\'')) {
             q = c;
-            for (;;) {
+            for (; ; ) {
                 c = next();
                 if (c < ' ') {
                     throw syntaxError("Unterminated string.");
@@ -46,7 +44,7 @@ public class HTTPTokener extends JSONTokener {
                 sb.append(c);
             }
         }
-        for (;;) {
+        for (; ; ) {
             if ((c == 0) || Character.isWhitespace(c)) {
                 return sb.toString();
             }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONArray.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONArray.java
index 94f91f072..d82e9c6a8 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONArray.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONArray.java
@@ -30,45 +30,29 @@ import java.util.Collection;
 import java.util.Map;
 
 /**
- * A JSONArray is an ordered sequence of values. Its external text form is a
- * string wrapped in square brackets with commas separating the values. The
- * internal form is an object having get and opt
- * methods for accessing the values by index, and put methods for
- * adding or replacing values. The values can be any of these types:
- * Boolean, JSONArray, JSONObject,
- * Number, String, or the
- * JSONObject.NULL object.
+ * A JSONArray is an ordered sequence of values. Its external text form is a string wrapped in square brackets with
+ * commas separating the values. The internal form is an object having get and opt methods for
+ * accessing the values by index, and put methods for adding or replacing values. The values can be any of
+ * these types: Boolean, JSONArray, JSONObject, Number,
+ * String, or the JSONObject.NULL object.
  * 

- * The constructor can convert a JSON text into a Java object. The
- * toString method converts to JSON text.
+ * The constructor can convert a JSON text into a Java object. The toString method converts to JSON text.
  * 

- * A get method returns a value if one can be found, and throws an
- * exception if one cannot be found. An opt method returns a
- * default value instead of throwing an exception, and so is useful for
- * obtaining optional values.
+ * A get method returns a value if one can be found, and throws an exception if one cannot be found. An
+ * opt method returns a default value instead of throwing an exception, and so is useful for obtaining
+ * optional values.
  * 

- * The generic get() and opt() methods return an
- * object which you can cast or query for type. There are also typed
- * get and opt methods that do type checking and type
- * coercion for you.
+ * The generic get() and opt() methods return an object which you can cast or query for type.
+ * There are also typed get and opt methods that do type checking and type coercion for you.
  * 

- * The texts produced by the toString methods strictly conform to
- * JSON syntax rules. The constructors are more forgiving in the texts they will
- * accept:
- * 
    
- * 
  • An extra , (comma) may appear just
- * before the closing bracket.
    • 
- * 
  • The null value will be inserted when there is ,
- *  (comma) elision.
    • 
- * 
  • Strings may be quoted with ' (single
- * quote).
    • 
- * 
  • Strings do not need to be quoted at all if they do not begin with a quote
- * or single quote, and if they do not contain leading or trailing spaces, and
- * if they do not contain any of these characters:
- * { } [ ] / \ : , # and if they do not look like numbers and if
- * they are not the reserved words true, false, or
- * null.
    • 
- * 

+ * The texts produced by the toString methods strictly conform to JSON syntax rules. The constructors are
+ * more forgiving in the texts they will accept: 
     
  • An extra , (comma) may appear
+ * just before the closing bracket.
    •  
  • The null value will be inserted when there is ,
+ *  (comma) elision.
    •  
  • Strings may be quoted with ' (single
+ * quote).
    •  
  • Strings do not need to be quoted at all if they do not begin with a quote or single quote,
+ * and if they do not contain leading or trailing spaces, and if they do not contain any of these characters: { }
+ * [ ] / \ : , # and if they do not look like numbers and if they are not the reserved words true,
+ * false, or null.
    •  

  *
  * @author JSON.org
  * @version 2014-05-03
@@ -90,10 +74,9 @@ public class JSONArray {
     /**
      * Construct a JSONArray from a JSONTokener.
      *
-     * @param x
-     *            A JSONTokener
-     * @throws JSONException
-     *             If there is a syntax error.
+     * @param x A JSONTokener
+     *
+     * @throws JSONException If there is a syntax error.
      */
     public JSONArray(final JSONTokener x) throws JSONException {
         this();
@@ -102,12 +85,11 @@ public class JSONArray {
         }
         if (x.nextClean() != ']') {
             x.back();
-            for (;;) {
+            for (; ; ) {
                 if (x.nextClean() == ',') {
                     x.back();
                     this.myArrayList.add(JSONObject.NULL);
-                }
-                else {
+                } else {
                     x.back();
                     this.myArrayList.add(x.nextValue());
                 }
@@ -130,12 +112,10 @@ public class JSONArray {
     /**
      * Construct a JSONArray from a source JSON text.
      *
-     * @param source
-     *            A string that begins with [ (left
-     *            bracket) and ends with ]
-     *             (right bracket).
-     * @throws JSONException
-     *             If there is a syntax error.
+     * @param source A string that begins with [ (left bracket) and ends with
+     *               ]  (right bracket).
+     *
+     * @throws JSONException If there is a syntax error.
      */
     public JSONArray(final String source) throws JSONException {
         this(new JSONTokener(source));
@@ -144,8 +124,7 @@ public class JSONArray {
     /**
      * Construct a JSONArray from a Collection.
      *
-     * @param collection
-     *            A Collection.
+     * @param collection A Collection.
      */
     public JSONArray(final Collection collection) {
         this.myArrayList = new ArrayList();
@@ -159,8 +138,7 @@ public class JSONArray {
     /**
      * Construct a JSONArray from an array
      *
-     * @throws JSONException
-     *             If not an array.
+     * @throws JSONException If not an array.
      */
     public JSONArray(final Object array) throws JSONException {
         this();
@@ -169,8 +147,7 @@ public class JSONArray {
             for (int i = 0; i < length; i += 1) {
                 this.put(JSONObject.wrap(Array.get(array, i)));
             }
-        }
-        else {
+        } else {
             throw new JSONException("JSONArray initial value should be a string or collection or array.");
         }
     }
@@ -178,11 +155,11 @@ public class JSONArray {
     /**
      * Get the object value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
+     *
      * @return An object value.
-     * @throws JSONException
-     *             If there is no value for the index.
+     *
+     * @throws JSONException If there is no value for the index.
      */
     public Object get(final int index) throws JSONException {
         final Object object = this.opt(index);
@@ -193,22 +170,19 @@ public class JSONArray {
     }
 
     /**
-     * Get the boolean value associated with an index. The string values "true"
-     * and "false" are converted to boolean.
+     * Get the boolean value associated with an index. The string values "true" and "false" are converted to boolean.
+     *
+     * @param index The index must be between 0 and length() - 1.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
      * @return The truth.
-     * @throws JSONException
-     *             If there is no value for the index or if the value is not
-     *             convertible to boolean.
+     *
+     * @throws JSONException If there is no value for the index or if the value is not convertible to boolean.
      */
     public boolean getBoolean(final int index) throws JSONException {
         final Object object = this.get(index);
         if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("false"))) {
             return false;
-        }
-        else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("true"))) {
+        } else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("true"))) {
             return true;
         }
         throw new JSONException("JSONArray[" + index + "] is not a boolean.");
@@ -217,19 +191,17 @@ public class JSONArray {
     /**
      * Get the double value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
+     *
      * @return The value.
-     * @throws JSONException
-     *             If the key is not found or if the value cannot be converted
-     *             to a number.
+     *
+     * @throws JSONException If the key is not found or if the value cannot be converted to a number.
      */
     public double getDouble(final int index) throws JSONException {
         final Object object = this.get(index);
         try {
             return object instanceof Number ? ((Number) object).doubleValue() : Double.parseDouble((String) object);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             throw new JSONException("JSONArray[" + index + "] is not a number.");
         }
     }
@@ -237,18 +209,17 @@ public class JSONArray {
     /**
      * Get the int value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
+     *
      * @return The value.
-     * @throws JSONException
-     *             If the key is not found or if the value is not a number.
+     *
+     * @throws JSONException If the key is not found or if the value is not a number.
      */
     public int getInt(final int index) throws JSONException {
         final Object object = this.get(index);
         try {
             return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             throw new JSONException("JSONArray[" + index + "] is not a number.");
         }
     }
@@ -256,12 +227,11 @@ public class JSONArray {
     /**
      * Get the JSONArray associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
+     *
      * @return A JSONArray value.
-     * @throws JSONException
-     *             If there is no value for the index. or if the value is not a
-     *             JSONArray
+     *
+     * @throws JSONException If there is no value for the index. or if the value is not a JSONArray
      */
     public JSONArray getJSONArray(final int index) throws JSONException {
         final Object object = this.get(index);
@@ -274,12 +244,11 @@ public class JSONArray {
     /**
      * Get the JSONObject associated with an index.
      *
-     * @param index
-     *            subscript
+     * @param index subscript
+     *
      * @return A JSONObject value.
-     * @throws JSONException
-     *             If there is no value for the index or if the value is not a
-     *             JSONObject
+     *
+     * @throws JSONException If there is no value for the index or if the value is not a JSONObject
      */
     public JSONObject getJSONObject(final int index) throws JSONException {
         final Object object = this.get(index);
@@ -292,19 +261,17 @@ public class JSONArray {
     /**
      * Get the long value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
+     *
      * @return The value.
-     * @throws JSONException
-     *             If the key is not found or if the value cannot be converted
-     *             to a number.
+     *
+     * @throws JSONException If the key is not found or if the value cannot be converted to a number.
      */
     public long getLong(final int index) throws JSONException {
         final Object object = this.get(index);
         try {
             return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             throw new JSONException("JSONArray[" + index + "] is not a number.");
         }
     }
@@ -312,11 +279,11 @@ public class JSONArray {
     /**
      * Get the string associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
+     *
      * @return A string value.
-     * @throws JSONException
-     *             If there is no string value for the index.
+     *
+     * @throws JSONException If there is no string value for the index.
      */
     public String getString(final int index) throws JSONException {
         final Object object = this.get(index);
@@ -329,8 +296,8 @@ public class JSONArray {
     /**
      * Determine if the value is null.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
+     *
      * @return true if the value at the index is null, or if there is no value.
      */
     public boolean isNull(final int index) {
@@ -338,15 +305,14 @@ public class JSONArray {
     }
 
     /**
-     * Make a string from the contents of this JSONArray. The
-     * separator string is inserted between each element. Warning:
-     * This method assumes that the data structure is acyclical.
+     * Make a string from the contents of this JSONArray. The separator string is inserted between each
+     * element. Warning: This method assumes that the data structure is acyclical.
+     *
+     * @param separator A string that will be inserted between the elements.
      *
-     * @param separator
-     *            A string that will be inserted between the elements.
      * @return a string.
-     * @throws JSONException
-     *             If the array contains an invalid number.
+     *
+     * @throws JSONException If the array contains an invalid number.
      */
     public String join(final String separator) throws JSONException {
         final int len = this.length();
@@ -373,8 +339,8 @@ public class JSONArray {
     /**
      * Get the optional object value associated with an index.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
+     * @param index The index must be between 0 and length() - 1.
+     *
      * @return An object value, or null if there is no object at that index.
      */
     public Object opt(final int index) {
@@ -382,12 +348,11 @@ public class JSONArray {
     }
 
     /**
-     * Get the optional boolean value associated with an index. It returns false
-     * if there is no value at that index, or if the value is not Boolean.TRUE
-     * or the String "true".
+     * Get the optional boolean value associated with an index. It returns false if there is no value at that index, or
+     * if the value is not Boolean.TRUE or the String "true".
+     *
+     * @param index The index must be between 0 and length() - 1.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
      * @return The truth.
      */
     public boolean optBoolean(final int index) {
@@ -395,32 +360,28 @@ public class JSONArray {
     }
 
     /**
-     * Get the optional boolean value associated with an index. It returns the
-     * defaultValue if there is no value at that index or if it is not a Boolean
-     * or the String "true" or "false" (case insensitive).
+     * Get the optional boolean value associated with an index. It returns the defaultValue if there is no value at that
+     * index or if it is not a Boolean or the String "true" or "false" (case insensitive).
+     *
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue A boolean default.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            A boolean default.
      * @return The truth.
      */
     public boolean optBoolean(final int index, final boolean defaultValue) {
         try {
             return this.getBoolean(index);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return defaultValue;
         }
     }
 
     /**
-     * Get the optional double value associated with an index. NaN is returned
-     * if there is no value for the index, or if the value is not a number and
-     * cannot be converted to a number.
+     * Get the optional double value associated with an index. NaN is returned if there is no value for the index, or if
+     * the value is not a number and cannot be converted to a number.
+     *
+     * @param index The index must be between 0 and length() - 1.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
      * @return The value.
      */
     public double optDouble(final int index) {
@@ -428,32 +389,28 @@ public class JSONArray {
     }
 
     /**
-     * Get the optional double value associated with an index. The defaultValue
-     * is returned if there is no value for the index, or if the value is not a
-     * number and cannot be converted to a number.
+     * Get the optional double value associated with an index. The defaultValue is returned if there is no value for the
+     * index, or if the value is not a number and cannot be converted to a number.
+     *
+     * @param index        subscript
+     * @param defaultValue The default value.
      *
-     * @param index
-     *            subscript
-     * @param defaultValue
-     *            The default value.
      * @return The value.
      */
     public double optDouble(final int index, final double defaultValue) {
         try {
             return this.getDouble(index);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return defaultValue;
         }
     }
 
     /**
-     * Get the optional int value associated with an index. Zero is returned if
-     * there is no value for the index, or if the value is not a number and
-     * cannot be converted to a number.
+     * Get the optional int value associated with an index. Zero is returned if there is no value for the index, or if
+     * the value is not a number and cannot be converted to a number.
+     *
+     * @param index The index must be between 0 and length() - 1.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
      * @return The value.
      */
     public int optInt(final int index) {
@@ -461,21 +418,18 @@ public class JSONArray {
     }
 
     /**
-     * Get the optional int value associated with an index. The defaultValue is
-     * returned if there is no value for the index, or if the value is not a
-     * number and cannot be converted to a number.
+     * Get the optional int value associated with an index. The defaultValue is returned if there is no value for the
+     * index, or if the value is not a number and cannot be converted to a number.
+     *
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default value.
      * @return The value.
      */
     public int optInt(final int index, final int defaultValue) {
         try {
             return this.getInt(index);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return defaultValue;
         }
     }
@@ -483,10 +437,9 @@ public class JSONArray {
     /**
      * Get the optional JSONArray associated with an index.
      *
-     * @param index
-     *            subscript
-     * @return A JSONArray value, or null if the index has no value, or if the
-     *         value is not a JSONArray.
+     * @param index subscript
+     *
+     * @return A JSONArray value, or null if the index has no value, or if the value is not a JSONArray.
      */
     public JSONArray optJSONArray(final int index) {
         final Object o = this.opt(index);
@@ -494,12 +447,11 @@ public class JSONArray {
     }
 
     /**
-     * Get the optional JSONObject associated with an index. Null is returned if
-     * the key is not found, or null if the index has no value, or if the value
-     * is not a JSONObject.
+     * Get the optional JSONObject associated with an index. Null is returned if the key is not found, or null if the
+     * index has no value, or if the value is not a JSONObject.
+     *
+     * @param index The index must be between 0 and length() - 1.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
      * @return A JSONObject value.
      */
     public JSONObject optJSONObject(final int index) {
@@ -508,12 +460,11 @@ public class JSONArray {
     }
 
     /**
-     * Get the optional long value associated with an index. Zero is returned if
-     * there is no value for the index, or if the value is not a number and
-     * cannot be converted to a number.
+     * Get the optional long value associated with an index. Zero is returned if there is no value for the index, or if
+     * the value is not a number and cannot be converted to a number.
+     *
+     * @param index The index must be between 0 and length() - 1.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
      * @return The value.
      */
     public long optLong(final int index) {
@@ -521,32 +472,28 @@ public class JSONArray {
     }
 
     /**
-     * Get the optional long value associated with an index. The defaultValue is
-     * returned if there is no value for the index, or if the value is not a
-     * number and cannot be converted to a number.
+     * Get the optional long value associated with an index. The defaultValue is returned if there is no value for the
+     * index, or if the value is not a number and cannot be converted to a number.
+     *
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default value.
      * @return The value.
      */
     public long optLong(final int index, final long defaultValue) {
         try {
             return this.getLong(index);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return defaultValue;
         }
     }
 
     /**
-     * Get the optional string value associated with an index. It returns an
-     * empty string if there is no value at that index. If the value is not a
-     * string and is not null, then it is coverted to a string.
+     * Get the optional string value associated with an index. It returns an empty string if there is no value at that
+     * index. If the value is not a string and is not null, then it is coverted to a string.
+     *
+     * @param index The index must be between 0 and length() - 1.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
      * @return A String value.
      */
     public String optString(final int index) {
@@ -554,13 +501,11 @@ public class JSONArray {
     }
 
     /**
-     * Get the optional string associated with an index. The defaultValue is
-     * returned if the key is not found.
+     * Get the optional string associated with an index. The defaultValue is returned if the key is not found.
+     *
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
      *
-     * @param index
-     *            The index must be between 0 and length() - 1.
-     * @param defaultValue
-     *            The default value.
      * @return A String value.
      */
     public String optString(final int index, final String defaultValue) {
@@ -571,8 +516,8 @@ public class JSONArray {
     /**
      * Append a boolean value. This increases the array's length by one.
      *
-     * @param value
-     *            A boolean value.
+     * @param value A boolean value.
+     *
      * @return this.
      */
     public JSONArray put(final boolean value) {
@@ -581,11 +526,10 @@ public class JSONArray {
     }
 
     /**
-     * Put a value in the JSONArray, where the value will be a JSONArray which
-     * is produced from a Collection.
+     * Put a value in the JSONArray, where the value will be a JSONArray which is produced from a Collection.
+     *
+     * @param value A Collection value.
      *
-     * @param value
-     *            A Collection value.
      * @return this.
      */
     public JSONArray put(final Collection value) {
@@ -596,11 +540,11 @@ public class JSONArray {
     /**
      * Append a double value. This increases the array's length by one.
      *
-     * @param value
-     *            A double value.
+     * @param value A double value.
+     *
      * @return this.
-     * @throws JSONException
-     *             if the value is not finite.
+     *
+     * @throws JSONException if the value is not finite.
      */
     public JSONArray put(final double value) throws JSONException {
         final Double d = value;
@@ -612,8 +556,8 @@ public class JSONArray {
     /**
      * Append an int value. This increases the array's length by one.
      *
-     * @param value
-     *            An int value.
+     * @param value An int value.
+     *
      * @return this.
      */
     public JSONArray put(final int value) {
@@ -624,8 +568,8 @@ public class JSONArray {
     /**
      * Append an long value. This increases the array's length by one.
      *
-     * @param value
-     *            A long value.
+     * @param value A long value.
+     *
      * @return this.
      */
     public JSONArray put(final long value) {
@@ -634,11 +578,10 @@ public class JSONArray {
     }
 
     /**
-     * Put a value in the JSONArray, where the value will be a JSONObject which
-     * is produced from a Map.
+     * Put a value in the JSONArray, where the value will be a JSONObject which is produced from a Map.
+     *
+     * @param value A Map value.
      *
-     * @param value
-     *            A Map value.
      * @return this.
      */
     public JSONArray put(final Map value) {
@@ -649,10 +592,9 @@ public class JSONArray {
     /**
      * Append an object value. This increases the array's length by one.
      *
-     * @param value
-     *            An object value. The value should be a Boolean, Double,
-     *            Integer, JSONArray, JSONObject, Long, or String, or the
-     *            JSONObject.NULL object.
+     * @param value An object value. The value should be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or
+     *              String, or the JSONObject.NULL object.
+     *
      * @return this.
      */
     public JSONArray put(final Object value) {
@@ -661,17 +603,15 @@ public class JSONArray {
     }
 
     /**
-     * Put or replace a boolean value in the JSONArray. If the index is greater
-     * than the length of the JSONArray, then null elements will be added as
-     * necessary to pad it out.
+     * Put or replace a boolean value in the JSONArray. If the index is greater than the length of the JSONArray, then
+     * null elements will be added as necessary to pad it out.
+     *
+     * @param index The subscript.
+     * @param value A boolean value.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            A boolean value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative.
+     *
+     * @throws JSONException If the index is negative.
      */
     public JSONArray put(final int index, final boolean value) throws JSONException {
         this.put(index, value ? Boolean.TRUE : Boolean.FALSE);
@@ -679,16 +619,14 @@ public class JSONArray {
     }
 
     /**
-     * Put a value in the JSONArray, where the value will be a JSONArray which
-     * is produced from a Collection.
+     * Put a value in the JSONArray, where the value will be a JSONArray which is produced from a Collection.
+     *
+     * @param index The subscript.
+     * @param value A Collection value.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            A Collection value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative or if the value is not finite.
+     *
+     * @throws JSONException If the index is negative or if the value is not finite.
      */
     public JSONArray put(final int index, final Collection value) throws JSONException {
         this.put(index, new JSONArray(value));
@@ -696,17 +634,15 @@ public class JSONArray {
     }
 
     /**
-     * Put or replace a double value. If the index is greater than the length of
-     * the JSONArray, then null elements will be added as necessary to pad it
-     * out.
+     * Put or replace a double value. If the index is greater than the length of the JSONArray, then null elements will
+     * be added as necessary to pad it out.
+     *
+     * @param index The subscript.
+     * @param value A double value.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            A double value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative or if the value is not finite.
+     *
+     * @throws JSONException If the index is negative or if the value is not finite.
      */
     public JSONArray put(final int index, final double value) throws JSONException {
         this.put(index, new Double(value));
@@ -714,17 +650,15 @@ public class JSONArray {
     }
 
     /**
-     * Put or replace an int value. If the index is greater than the length of
-     * the JSONArray, then null elements will be added as necessary to pad it
-     * out.
+     * Put or replace an int value. If the index is greater than the length of the JSONArray, then null elements will be
+     * added as necessary to pad it out.
+     *
+     * @param index The subscript.
+     * @param value An int value.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            An int value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative.
+     *
+     * @throws JSONException If the index is negative.
      */
     public JSONArray put(final int index, final int value) throws JSONException {
         this.put(index, new Integer(value));
@@ -732,17 +666,15 @@ public class JSONArray {
     }
 
     /**
-     * Put or replace a long value. If the index is greater than the length of
-     * the JSONArray, then null elements will be added as necessary to pad it
-     * out.
+     * Put or replace a long value. If the index is greater than the length of the JSONArray, then null elements will be
+     * added as necessary to pad it out.
+     *
+     * @param index The subscript.
+     * @param value A long value.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            A long value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative.
+     *
+     * @throws JSONException If the index is negative.
      */
     public JSONArray put(final int index, final long value) throws JSONException {
         this.put(index, new Long(value));
@@ -750,17 +682,14 @@ public class JSONArray {
     }
 
     /**
-     * Put a value in the JSONArray, where the value will be a JSONObject that
-     * is produced from a Map.
+     * Put a value in the JSONArray, where the value will be a JSONObject that is produced from a Map.
+     *
+     * @param index The subscript.
+     * @param value The Map value.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            The Map value.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative or if the the value is an invalid
-     *             number.
+     *
+     * @throws JSONException If the index is negative or if the the value is an invalid number.
      */
     public JSONArray put(final int index, final Map value) throws JSONException {
         this.put(index, new JSONObject(value));
@@ -768,20 +697,16 @@ public class JSONArray {
     }
 
     /**
-     * Put or replace an object value in the JSONArray. If the index is greater
-     * than the length of the JSONArray, then null elements will be added as
-     * necessary to pad it out.
+     * Put or replace an object value in the JSONArray. If the index is greater than the length of the JSONArray, then
+     * null elements will be added as necessary to pad it out.
+     *
+     * @param index The subscript.
+     * @param value The value to put into the array. The value should be a Boolean, Double, Integer, JSONArray,
+     *              JSONObject, Long, or String, or the JSONObject.NULL object.
      *
-     * @param index
-     *            The subscript.
-     * @param value
-     *            The value to put into the array. The value should be a
-     *            Boolean, Double, Integer, JSONArray, JSONObject, Long, or
-     *            String, or the JSONObject.NULL object.
      * @return this.
-     * @throws JSONException
-     *             If the index is negative or if the the value is an invalid
-     *             number.
+     *
+     * @throws JSONException If the index is negative or if the the value is an invalid number.
      */
     public JSONArray put(final int index, final Object value) throws JSONException {
         JSONObject.testValidity(value);
@@ -790,8 +715,7 @@ public class JSONArray {
         }
         if (index < this.length()) {
             this.myArrayList.set(index, value);
-        }
-        else {
+        } else {
             while (index != this.length()) {
                 this.put(JSONObject.NULL);
             }
@@ -803,21 +727,19 @@ public class JSONArray {
     /**
      * Remove an index and close the hole.
      *
-     * @param index
-     *            The index of the element to be removed.
-     * @return The value that was associated with the index, or null if there
-     *         was no value.
+     * @param index The index of the element to be removed.
+     *
+     * @return The value that was associated with the index, or null if there was no value.
      */
     public Object remove(final int index) {
         return (index >= 0) && (index < this.length()) ? this.myArrayList.remove(index) : null;
     }
 
     /**
-     * Determine if two JSONArrays are similar.
-     * They must contain similar sequences.
+     * Determine if two JSONArrays are similar. They must contain similar sequences.
+     *
+     * @param other The other JSONArray
      *
-     * @param other
-     *            The other JSONArray
      * @return true if they are equal
      */
     public boolean similar(final Object other) {
@@ -835,13 +757,11 @@ public class JSONArray {
                 if (!((JSONObject) valueThis).similar(valueOther)) {
                     return false;
                 }
-            }
-            else if (valueThis instanceof JSONArray) {
+            } else if (valueThis instanceof JSONArray) {
                 if (!((JSONArray) valueThis).similar(valueOther)) {
                     return false;
                 }
-            }
-            else if (!valueThis.equals(valueOther)) {
+            } else if (!valueThis.equals(valueOther)) {
                 return false;
             }
         }
@@ -849,16 +769,13 @@ public class JSONArray {
     }
 
     /**
-     * Produce a JSONObject by combining a JSONArray of names with the values of
-     * this JSONArray.
+     * Produce a JSONObject by combining a JSONArray of names with the values of this JSONArray.
      *
-     * @param names
-     *            A JSONArray containing a list of key strings. These will be
-     *            paired with the values.
-     * @return A JSONObject, or null if there are no names or if this JSONArray
-     *         has no values.
-     * @throws JSONException
-     *             If any of the names are null.
+     * @param names A JSONArray containing a list of key strings. These will be paired with the values.
+     *
+     * @return A JSONObject, or null if there are no names or if this JSONArray has no values.
+     *
+     * @throws JSONException If any of the names are null.
      */
     public JSONObject toJSONObject(final JSONArray names) throws JSONException {
         if ((names == null) || (names.length() == 0) || (this.length() == 0)) {
@@ -872,36 +789,33 @@ public class JSONArray {
     }
 
     /**
-     * Make a JSON text of this JSONArray. For compactness, no unnecessary
-     * whitespace is added. If it is not possible to produce a syntactically
-     * correct JSON text then null will be returned instead. This could occur if
-     * the array contains an invalid number.
+     * Make a JSON text of this JSONArray. For compactness, no unnecessary whitespace is added. If it is not possible to
+     * produce a syntactically correct JSON text then null will be returned instead. This could occur if the array
+     * contains an invalid number.
      * 

      * Warning: This method assumes that the data structure is acyclical.
      *
-     * @return a printable, displayable, transmittable representation of the
-     *         array.
+     * @return a printable, displayable, transmittable representation of the array.
      */
     @Override
     public String toString() {
         try {
             return this.toString(0);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return null;
         }
     }
 
     /**
-     * Make a prettyprinted JSON text of this JSONArray. Warning: This method
-     * assumes that the data structure is acyclical.
+     * Make a prettyprinted JSON text of this JSONArray. Warning: This method assumes that the data structure is
+     * acyclical.
+     *
+     * @param indentFactor The number of spaces to add to each level of indentation.
+     *
+     * @return a printable, displayable, transmittable representation of the object, beginning with
+     * [ (left bracket) and ending with ]  (right
+     * bracket).
      *
-     * @param indentFactor
-     *            The number of spaces to add to each level of indentation.
-     * @return a printable, displayable, transmittable representation of the
-     *         object, beginning with [ (left
-     *         bracket) and ending with ]
-     *          (right bracket).
      * @throws JSONException
      */
     public String toString(final int indentFactor) throws JSONException {
@@ -912,12 +826,12 @@ public class JSONArray {
     }
 
     /**
-     * Write the contents of the JSONArray as JSON text to a writer. For
-     * compactness, no whitespace is added.
+     * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
      * 

      * Warning: This method assumes that the data structure is acyclical.
      *
      * @return The writer.
+     *
      * @throws JSONException
      */
     public Writer write(final Writer writer) throws JSONException {
@@ -925,16 +839,15 @@ public class JSONArray {
     }
 
     /**
-     * Write the contents of the JSONArray as JSON text to a writer. For
-     * compactness, no whitespace is added.
+     * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
      * 

      * Warning: This method assumes that the data structure is acyclical.
      *
-     * @param indentFactor
-     *            The number of spaces to add to each level of indentation.
-     * @param indent
-     *            The indention of the top level.
+     * @param indentFactor The number of spaces to add to each level of indentation.
+     * @param indent       The indention of the top level.
+     *
      * @return The writer.
+     *
      * @throws JSONException
      */
     Writer write(final Writer writer, final int indentFactor, final int indent) throws JSONException {
@@ -945,8 +858,7 @@ public class JSONArray {
 
             if (length == 1) {
                 JSONObject.writeValue(writer, this.myArrayList.get(0), indentFactor, indent);
-            }
-            else if (length != 0) {
+            } else if (length != 0) {
                 final int newindent = indent + indentFactor;
 
                 for (int i = 0; i < length; i += 1) {
@@ -967,8 +879,7 @@ public class JSONArray {
             }
             writer.write(']');
             return writer;
-        }
-        catch (final IOException e) {
+        } catch (final IOException e) {
             throw new JSONException(e);
         }
     }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONException.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONException.java
index 17f89893f..090d4e4f7 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONException.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONException.java
@@ -8,13 +8,12 @@ package com.intellectualcrafters.json;
  */
 public class JSONException extends RuntimeException {
     private static final long serialVersionUID = 0;
-    private Throwable         cause;
+    private Throwable cause;
 
     /**
      * Constructs a JSONException with an explanatory message.
      *
-     * @param message
-     *            Detail about the reason for the exception.
+     * @param message Detail about the reason for the exception.
      */
     public JSONException(final String message) {
         super(message);
@@ -23,8 +22,7 @@ public class JSONException extends RuntimeException {
     /**
      * Constructs a new JSONException with the specified cause.
      *
-     * @param cause
-     *            The cause.
+     * @param cause The cause.
      */
     public JSONException(final Throwable cause) {
         super(cause.getMessage());
@@ -32,11 +30,9 @@ public class JSONException extends RuntimeException {
     }
 
     /**
-     * Returns the cause of this exception or null if the cause is nonexistent
-     * or unknown.
+     * Returns the cause of this exception or null if the cause is nonexistent or unknown.
      *
-     * @return the cause of this exception or null if the cause is nonexistent
-     *         or unknown.
+     * @return the cause of this exception or null if the cause is nonexistent or unknown.
      */
     @Override
     public Throwable getCause() {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONML.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONML.java
index fb6533f65..307ac1bef 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONML.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONML.java
@@ -3,9 +3,8 @@ package com.intellectualcrafters.json;
 import java.util.Iterator;
 
 /**
- * This provides static methods to convert an XML text into a JSONArray or
- * JSONObject, and to covert a JSONArray or JSONObject into an XML text using
- * the JsonML transform.
+ * This provides static methods to convert an XML text into a JSONArray or JSONObject, and to covert a JSONArray or
+ * JSONObject into an XML text using the JsonML transform.
  *
  * @author JSON.org
  * @version 2014-05-03
@@ -15,14 +14,12 @@ public class JSONML {
     /**
      * Parse XML values and store them in a JSONArray.
      *
-     * @param x
-     *            The XMLTokener containing the source string.
-     * @param arrayForm
-     *            true if array form, false if object form.
-     * @param ja
-     *            The JSONArray that is containing the current tag or null
-     *            if we are at the outermost level.
+     * @param x         The XMLTokener containing the source string.
+     * @param arrayForm true if array form, false if object form.
+     * @param ja        The JSONArray that is containing the current tag or null if we are at the outermost level.
+     *
      * @return A JSONArray if the value is the outermost tag, otherwise null.
+     *
      * @throws JSONException
      */
     private static Object parse(final XMLTokener x, final boolean arrayForm, final JSONArray ja) throws JSONException {
@@ -61,8 +58,7 @@ public class JSONML {
                             throw x.syntaxError("Misshaped close tag");
                         }
                         return token;
-                    }
-                    else if (token == XML.BANG) {
+                    } else if (token == XML.BANG) {
 
                         // ");
-                            }
-                            else {
+                            } else {
                                 x.back();
                             }
-                        }
-                        else if (c == '[') {
+                        } else if (c == '[') {
                             token = x.nextToken();
                             if (token.equals("CDATA") && (x.next() == '[')) {
                                 if (ja != null) {
                                     ja.put(x.nextCDATA());
                                 }
-                            }
-                            else {
+                            } else {
                                 throw x.syntaxError("Expected 'CDATA['");
                             }
-                        }
-                        else {
+                        } else {
                             i = 1;
                             do {
                                 token = x.nextMeta();
                                 if (token == null) {
                                     throw x.syntaxError("Missing '>' after ' 0);
+                            } while (i > 0);
                         }
-                    }
-                    else if (token == XML.QUEST) {
+                    } else if (token == XML.QUEST) {
 
                         // ");
-                    }
-                    else {
+                    } else {
                         throw x.syntaxError("Misshaped tag");
                     }
 
                     // Open tag <
 
-                }
-                else {
+                } else {
                     if (!(token instanceof String)) {
                         throw x.syntaxError("Bad tagName '" + token + "'.");
                     }
@@ -128,15 +114,14 @@ public class JSONML {
                         if (ja != null) {
                             ja.put(newja);
                         }
-                    }
-                    else {
+                    } else {
                         newjo.put("tagName", tagName);
                         if (ja != null) {
                             ja.put(newjo);
                         }
                     }
                     token = null;
-                    for (;;) {
+                    for (; ; ) {
                         if (token == null) {
                             token = x.nextToken();
                         }
@@ -161,8 +146,7 @@ public class JSONML {
                             }
                             newjo.accumulate(attribute, XML.stringToValue((String) token));
                             token = null;
-                        }
-                        else {
+                        } else {
                             newjo.accumulate(attribute, "");
                         }
                     }
@@ -179,16 +163,14 @@ public class JSONML {
                         if (ja == null) {
                             if (arrayForm) {
                                 return newja;
-                            }
-                            else {
+                            } else {
                                 return newjo;
                             }
                         }
 
                         // Content, between <...> and 
 
-                    }
-                    else {
+                    } else {
                         if (token != XML.GT) {
                             throw x.syntaxError("Misshaped tag");
                         }
@@ -204,16 +186,14 @@ public class JSONML {
                             if (ja == null) {
                                 if (arrayForm) {
                                     return newja;
-                                }
-                                else {
+                                } else {
                                     return newjo;
                                 }
                             }
                         }
                     }
                 }
-            }
-            else {
+            } else {
                 if (ja != null) {
                     ja.put(token instanceof String ? XML.stringToValue((String) token) : token);
                 }
@@ -222,17 +202,15 @@ public class JSONML {
     }
 
     /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONArray using the JsonML transform. Each XML tag is represented as
-     * a JSONArray in which the first element is the tag name. If the tag has
-     * attributes, then the second element will be JSONObject containing the
-     * name/value pairs. If the tag contains children, then strings and
-     * JSONArrays will represent the child tags.
-     * Comments, prologs, DTDs, and <[ [ ]]> are ignored.
+     * Convert a well-formed (but not necessarily valid) XML string into a JSONArray using the JsonML transform. Each
+     * XML tag is represented as a JSONArray in which the first element is the tag name. If the tag has attributes, then
+     * the second element will be JSONObject containing the name/value pairs. If the tag contains children, then strings
+     * and JSONArrays will represent the child tags. Comments, prologs, DTDs, and <[ [ ]]> are ignored.
+     *
+     * @param string The source string.
      *
-     * @param string
-     *            The source string.
      * @return A JSONArray containing the structured data from the XML string.
+     *
      * @throws JSONException
      */
     public static JSONArray toJSONArray(final String string) throws JSONException {
@@ -240,17 +218,16 @@ public class JSONML {
     }
 
     /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONArray using the JsonML transform. Each XML tag is represented as
-     * a JSONArray in which the first element is the tag name. If the tag has
-     * attributes, then the second element will be JSONObject containing the
-     * name/value pairs. If the tag contains children, then strings and
-     * JSONArrays will represent the child content and tags.
-     * Comments, prologs, DTDs, and <[ [ ]]> are ignored.
+     * Convert a well-formed (but not necessarily valid) XML string into a JSONArray using the JsonML transform. Each
+     * XML tag is represented as a JSONArray in which the first element is the tag name. If the tag has attributes, then
+     * the second element will be JSONObject containing the name/value pairs. If the tag contains children, then strings
+     * and JSONArrays will represent the child content and tags. Comments, prologs, DTDs, and <[ [ ]]>
+     * are ignored.
+     *
+     * @param x An XMLTokener.
      *
-     * @param x
-     *            An XMLTokener.
      * @return A JSONArray containing the structured data from the XML string.
+     *
      * @throws JSONException
      */
     public static JSONArray toJSONArray(final XMLTokener x) throws JSONException {
@@ -258,18 +235,17 @@ public class JSONML {
     }
 
     /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONObject using the JsonML transform. Each XML tag is represented as
-     * a JSONObject with a "tagName" property. If the tag has attributes, then
-     * the attributes will be in the JSONObject as properties. If the tag
-     * contains children, the object will have a "childNodes" property which
-     * will be an array of strings and JsonML JSONObjects.
+     * Convert a well-formed (but not necessarily valid) XML string into a JSONObject using the JsonML transform. Each
+     * XML tag is represented as a JSONObject with a "tagName" property. If the tag has attributes, then the attributes
+     * will be in the JSONObject as properties. If the tag contains children, the object will have a "childNodes"
+     * property which will be an array of strings and JsonML JSONObjects.
      * 

      * Comments, prologs, DTDs, and <[ [ ]]> are ignored.
      *
-     * @param x
-     *            An XMLTokener of the XML source text.
+     * @param x An XMLTokener of the XML source text.
+     *
      * @return A JSONObject containing the structured data from the XML string.
+     *
      * @throws JSONException
      */
     public static JSONObject toJSONObject(final XMLTokener x) throws JSONException {
@@ -277,18 +253,17 @@ public class JSONML {
     }
 
     /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONObject using the JsonML transform. Each XML tag is represented as
-     * a JSONObject with a "tagName" property. If the tag has attributes, then
-     * the attributes will be in the JSONObject as properties. If the tag
-     * contains children, the object will have a "childNodes" property which
-     * will be an array of strings and JsonML JSONObjects.
+     * Convert a well-formed (but not necessarily valid) XML string into a JSONObject using the JsonML transform. Each
+     * XML tag is represented as a JSONObject with a "tagName" property. If the tag has attributes, then the attributes
+     * will be in the JSONObject as properties. If the tag contains children, the object will have a "childNodes"
+     * property which will be an array of strings and JsonML JSONObjects.
      * 

      * Comments, prologs, DTDs, and <[ [ ]]> are ignored.
      *
-     * @param string
-     *            The XML source text.
+     * @param string The XML source text.
+     *
      * @return A JSONObject containing the structured data from the XML string.
+     *
      * @throws JSONException
      */
     public static JSONObject toJSONObject(final String string) throws JSONException {
@@ -298,9 +273,10 @@ public class JSONML {
     /**
      * Reverse the JSONML transformation, making an XML text from a JSONArray.
      *
-     * @param ja
-     *            A JSONArray.
+     * @param ja A JSONArray.
+     *
      * @return An XML string.
+     *
      * @throws JSONException
      */
     public static String toString(final JSONArray ja) throws JSONException {
@@ -343,8 +319,7 @@ public class JSONML {
                     sb.append('"');
                 }
             }
-        }
-        else {
+        } else {
             i = 1;
         }
 
@@ -354,8 +329,7 @@ public class JSONML {
         if (i >= length) {
             sb.append('/');
             sb.append('>');
-        }
-        else {
+        } else {
             sb.append('>');
             do {
                 object = ja.get(i);
@@ -363,16 +337,13 @@ public class JSONML {
                 if (object != null) {
                     if (object instanceof String) {
                         sb.append(XML.escape(object.toString()));
-                    }
-                    else if (object instanceof JSONObject) {
+                    } else if (object instanceof JSONObject) {
                         sb.append(toString((JSONObject) object));
-                    }
-                    else if (object instanceof JSONArray) {
+                    } else if (object instanceof JSONArray) {
                         sb.append(toString((JSONArray) object));
                     }
                 }
-            }
-            while (i < length);
+            } while (i < length);
             sb.append('<');
             sb.append('/');
             sb.append(tagName);
@@ -382,14 +353,14 @@ public class JSONML {
     }
 
     /**
-     * Reverse the JSONML transformation, making an XML text from a JSONObject.
-     * The JSONObject must contain a "tagName" property. If it has children,
-     * then it must have a "childNodes" property containing an array of objects.
-     * The other properties are attributes with string values.
+     * Reverse the JSONML transformation, making an XML text from a JSONObject. The JSONObject must contain a "tagName"
+     * property. If it has children, then it must have a "childNodes" property containing an array of objects. The other
+     * properties are attributes with string values.
+     *
+     * @param jo A JSONObject.
      *
-     * @param jo
-     *            A JSONObject.
      * @return An XML string.
+     *
      * @throws JSONException
      */
     public static String toString(final JSONObject jo) throws JSONException {
@@ -439,8 +410,7 @@ public class JSONML {
         if (ja == null) {
             sb.append('/');
             sb.append('>');
-        }
-        else {
+        } else {
             sb.append('>');
             length = ja.length();
             for (i = 0; i < length; i += 1) {
@@ -448,14 +418,11 @@ public class JSONML {
                 if (object != null) {
                     if (object instanceof String) {
                         sb.append(XML.escape(object.toString()));
-                    }
-                    else if (object instanceof JSONObject) {
+                    } else if (object instanceof JSONObject) {
                         sb.append(toString((JSONObject) object));
-                    }
-                    else if (object instanceof JSONArray) {
+                    } else if (object instanceof JSONArray) {
                         sb.append(toString((JSONArray) object));
-                    }
-                    else {
+                    } else {
                         sb.append(object.toString());
                     }
                 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONObject.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONObject.java
index d21aeb630..eca997fc6 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONObject.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONObject.java
@@ -6,76 +6,53 @@ import java.io.Writer;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.ResourceBundle;
-import java.util.Set;
 
 /**
- * A JSONObject is an unordered collection of name/value pairs. Its external
- * form is a string wrapped in curly braces with colons between the names and
- * values, and commas between the values and names. The internal form is an
- * object having get and opt methods for accessing
- * the values by name, and put methods for adding or replacing
- * values by name. The values can be any of these types: Boolean,
- * JSONArray, JSONObject, Number,
- * String, or the JSONObject.NULL object. A
- * JSONObject constructor can be used to convert an external form JSON text
- * into an internal form whose values can be retrieved with the get
- * and opt methods, or to convert values into a
- * JSON text using the put and toString methods. A
- * get method returns a value if one can be found, and throws an
- * exception if one cannot be found. An opt method returns a
- * default value instead of throwing an exception, and so is useful for
- * obtaining optional values.
+ * A JSONObject is an unordered collection of name/value pairs. Its external form is a string wrapped in curly braces
+ * with colons between the names and values, and commas between the values and names. The internal form is an object
+ * having get and opt methods for accessing the values by name, and put methods
+ * for adding or replacing values by name. The values can be any of these types: Boolean,
+ * JSONArray, JSONObject, Number, String, or the
+ * JSONObject.NULL object. A JSONObject constructor can be used to convert an external form JSON text into
+ * an internal form whose values can be retrieved with the get and opt methods, or to convert
+ * values into a JSON text using the put and toString methods. A get method
+ * returns a value if one can be found, and throws an exception if one cannot be found. An opt method
+ * returns a default value instead of throwing an exception, and so is useful for obtaining optional values.
  * 

- * The generic get() and opt() methods return an
- * object, which you can cast or query for type. There are also typed
- * get and opt methods that do type checking and type
- * coercion for you. The opt methods differ from the get methods in that they do
- * not throw. Instead, they return a specified value, such as null.
+ * The generic get() and opt() methods return an object, which you can cast or query for type.
+ * There are also typed get and opt methods that do type checking and type coercion for you.
+ * The opt methods differ from the get methods in that they do not throw. Instead, they return a specified value, such
+ * as null.
  * 

  * The put methods add or replace values in an object. For example,
  * 

- *
+ * 

  * 
  * myString = new JSONObject().put("JSON", "Hello, World!").toString();
  * 

  * 

  * produces the string {"JSON": "Hello, World"}.
  * 

- * The texts produced by the toString methods strictly conform to
- * the JSON syntax rules. The constructors are more forgiving in the texts they
- * will accept:
- * 
    
- * 
  • An extra , (comma) may appear just
- * before the closing brace.
    • 
- * 
  • Strings may be quoted with ' (single
- * quote).
    • 
- * 
  • Strings do not need to be quoted at all if they do not begin with a quote
- * or single quote, and if they do not contain leading or trailing spaces, and
- * if they do not contain any of these characters:
- * { } [ ] / \ : , # and if they do not look like numbers and if
- * they are not the reserved words true, false, or
- * null.
    • 
- * 

+ * The texts produced by the toString methods strictly conform to the JSON syntax rules. The constructors
+ * are more forgiving in the texts they will accept: 
     
  • An extra , (comma) may
+ * appear just before the closing brace.
    •  
  • Strings may be quoted with ' (single
+ * quote).
    •  
  • Strings do not need to be quoted at all if they do not begin with a quote or single quote,
+ * and if they do not contain leading or trailing spaces, and if they do not contain any of these characters: { }
+ * [ ] / \ : , # and if they do not look like numbers and if they are not the reserved words true,
+ * false, or null.
    •  

  *
  * @author JSON.org
  * @version 2014-05-03
  */
 public class JSONObject {
     /**
-     * It is sometimes more convenient and less ambiguous to have a
-     * NULL object than to use Java's null value.
-     * JSONObject.NULL.equals(null) returns true.
+     * It is sometimes more convenient and less ambiguous to have a NULL object than to use Java's
+     * null value. JSONObject.NULL.equals(null) returns true.
      * JSONObject.NULL.toString() returns "null".
      */
-    public static final Object        NULL = new Null();
+    public static final Object NULL = new Null();
     /**
      * The map where the JSONObject's properties are kept.
      */
@@ -89,26 +66,21 @@ public class JSONObject {
     }
 
     /**
-     * Construct a JSONObject from a subset of another JSONObject. An array of
-     * strings is used to identify the keys that should be copied. Missing keys
-     * are ignored.
+     * Construct a JSONObject from a subset of another JSONObject. An array of strings is used to identify the keys that
+     * should be copied. Missing keys are ignored.
+     *
+     * @param jo    A JSONObject.
+     * @param names An array of strings.
      *
-     * @param jo
-     *            A JSONObject.
-     * @param names
-     *            An array of strings.
      * @throws JSONException
-     * @throws JSONException
-     *             If a value is a non-finite number or if a name is
-     *             duplicated.
+     * @throws JSONException If a value is a non-finite number or if a name is duplicated.
      */
     public JSONObject(final JSONObject jo, final String[] names) {
         this();
         for (final String name : names) {
             try {
                 this.putOnce(name, jo.opt(name));
-            }
-            catch (final Exception ignore) {
+            } catch (final Exception ignore) {
             }
         }
     }
@@ -116,11 +88,9 @@ public class JSONObject {
     /**
      * Construct a JSONObject from a JSONTokener.
      *
-     * @param x
-     *            A JSONTokener object containing the source string.
-     * @throws JSONException
-     *             If there is a syntax error in the source string or a
-     *             duplicated key.
+     * @param x A JSONTokener object containing the source string.
+     *
+     * @throws JSONException If there is a syntax error in the source string or a duplicated key.
      */
     public JSONObject(final JSONTokener x) throws JSONException {
         this();
@@ -130,7 +100,7 @@ public class JSONObject {
         if (x.nextClean() != '{') {
             throw x.syntaxError("A JSONObject text must begin with '{'");
         }
-        for (;;) {
+        for (; ; ) {
             c = x.nextClean();
             switch (c) {
                 case 0:
@@ -171,9 +141,8 @@ public class JSONObject {
     /**
      * Construct a JSONObject from a Map.
      *
-     * @param map
-     *            A map object that can be used to initialize the contents of
-     *            the JSONObject.
+     * @param map A map object that can be used to initialize the contents of the JSONObject.
+     *
      * @throws JSONException
      */
     public JSONObject(final Map map) {
@@ -189,25 +158,19 @@ public class JSONObject {
     }
 
     /**
-     * Construct a JSONObject from an Object using bean getters. It reflects on
-     * all of the public methods of the object. For each of the methods with no
-     * parameters and a name starting with "get" or
-     * "is" followed by an uppercase letter, the method is invoked,
-     * and a key and the value returned from the getter method are put into the
-     * new JSONObject.
+     * Construct a JSONObject from an Object using bean getters. It reflects on all of the public methods of the object.
+     * For each of the methods with no parameters and a name starting with "get" or "is"
+     * followed by an uppercase letter, the method is invoked, and a key and the value returned from the getter method
+     * are put into the new JSONObject.
      * 

-     * The key is formed by removing the "get" or "is"
-     * prefix. If the second remaining character is not upper case, then the
-     * first character is converted to lower case.
+     * The key is formed by removing the "get" or "is" prefix. If the second remaining
+     * character is not upper case, then the first character is converted to lower case.
      * 

-     * For example, if an object has a method named "getName", and
-     * if the result of calling object.getName() is
-     * "Larry Fine", then the JSONObject will contain
-     * "name": "Larry Fine".
+     * For example, if an object has a method named "getName", and if the result of calling
+     * object.getName() is "Larry Fine", then the JSONObject will contain "name": "Larry
+     * Fine".
      *
-     * @param bean
-     *            An object that has getter methods that should be used to make
-     *            a JSONObject.
+     * @param bean An object that has getter methods that should be used to make a JSONObject.
      */
     public JSONObject(final Object bean) {
         this();
@@ -215,18 +178,12 @@ public class JSONObject {
     }
 
     /**
-     * Construct a JSONObject from an Object, using reflection to find the
-     * public members. The resulting JSONObject's keys will be the strings from
-     * the names array, and the values will be the field values associated with
-     * those keys in the object. If a key is not found or not visible, then it
-     * will not be copied into the new JSONObject.
+     * Construct a JSONObject from an Object, using reflection to find the public members. The resulting JSONObject's
+     * keys will be the strings from the names array, and the values will be the field values associated with those keys
+     * in the object. If a key is not found or not visible, then it will not be copied into the new JSONObject.
      *
-     * @param object
-     *            An object that has fields that should be used to make a
-     *            JSONObject.
-     * @param names
-     *            An array of strings, the names of the fields to be obtained
-     *            from the object.
+     * @param object An object that has fields that should be used to make a JSONObject.
+     * @param names  An array of strings, the names of the fields to be obtained from the object.
      */
     public JSONObject(final Object object, final String names[]) {
         this();
@@ -234,23 +191,18 @@ public class JSONObject {
         for (final String name : names) {
             try {
                 this.putOpt(name, c.getField(name).get(object));
-            }
-            catch (final Exception ignore) {
+            } catch (final Exception ignore) {
             }
         }
     }
 
     /**
-     * Construct a JSONObject from a source JSON text string. This is the most
-     * commonly used JSONObject constructor.
+     * Construct a JSONObject from a source JSON text string. This is the most commonly used JSONObject constructor.
      *
-     * @param source
-     *            A string beginning with { (left
-     *            brace) and ending with }
-     *             (right brace).
-     * @throws JSONException
-     *             If there is a syntax error in the source string or a
-     *             duplicated key.
+     * @param source A string beginning with { (left brace) and ending with
+     *               }  (right brace).
+     *
+     * @throws JSONException If there is a syntax error in the source string or a duplicated key.
      */
     public JSONObject(final String source) throws JSONException {
         this(new JSONTokener(source));
@@ -259,12 +211,10 @@ public class JSONObject {
     /**
      * Construct a JSONObject from a ResourceBundle.
      *
-     * @param baseName
-     *            The ResourceBundle base name.
-     * @param locale
-     *            The Locale to load the ResourceBundle for.
-     * @throws JSONException
-     *             If any JSONExceptions are detected.
+     * @param baseName The ResourceBundle base name.
+     * @param locale   The Locale to load the ResourceBundle for.
+     *
+     * @throws JSONException If any JSONExceptions are detected.
      */
     public JSONObject(final String baseName, final Locale locale) throws JSONException {
         this();
@@ -301,11 +251,10 @@ public class JSONObject {
     }
 
     /**
-     * Produce a string from a double. The string "null" will be returned if the
-     * number is not finite.
+     * Produce a string from a double. The string "null" will be returned if the number is not finite.
+     *
+     * @param d A double.
      *
-     * @param d
-     *            A double.
      * @return A String.
      */
     public static String doubleToString(final double d) {
@@ -372,11 +321,11 @@ public class JSONObject {
     /**
      * Produce a string from a Number.
      *
-     * @param number
-     *            A Number
+     * @param number A Number
+     *
      * @return A String.
-     * @throws JSONException
-     *             If n is a non-finite number.
+     *
+     * @throws JSONException If n is a non-finite number.
      */
     public static String numberToString(final Number number) throws JSONException {
         if (number == null) {
@@ -399,13 +348,12 @@ public class JSONObject {
     }
 
     /**
-     * Produce a string in double quotes with backslash sequences in all the
-     * right places. A backslash will be inserted within 
      * 

      * Warning: This method assumes that the data structure is acyclical.
      *
-     * @param value
-     *            The value to be serialized.
-     * @return a printable, displayable, transmittable representation of the
-     *         object, beginning with { (left
-     *         brace) and ending with } (right
-     *         brace).
-     * @throws JSONException
-     *             If the value is or contains an invalid number.
+     * @param value The value to be serialized.
+     *
+     * @return a printable, displayable, transmittable representation of the object, beginning with
+     * { (left brace) and ending with } (right
+     * brace).
+     *
+     * @throws JSONException If the value is or contains an invalid number.
      */
     public static String valueToString(final Object value) throws JSONException {
         if ((value == null) || value.equals(null)) {
@@ -590,8 +525,7 @@ public class JSONObject {
             Object object;
             try {
                 object = ((JSONString) value).toJSONString();
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 throw new JSONException(e);
             }
             if (object instanceof String) {
@@ -618,15 +552,13 @@ public class JSONObject {
     }
 
     /**
-     * Wrap an object, if necessary. If the object is null, return the NULL
-     * object. If it is an array or collection, wrap it in a JSONArray. If it is
-     * a map, wrap it in a JSONObject. If it is a standard property (Double,
-     * String, et al) then it is already wrapped. Otherwise, if it comes from
-     * one of the java packages, turn it into a string. And if it doesn't, try
-     * to wrap it in a JSONObject. If the wrapping fails, then null is returned.
+     * Wrap an object, if necessary. If the object is null, return the NULL object. If it is an array or collection,
+     * wrap it in a JSONArray. If it is a map, wrap it in a JSONObject. If it is a standard property (Double, String, et
+     * al) then it is already wrapped. Otherwise, if it comes from one of the java packages, turn it into a string. And
+     * if it doesn't, try to wrap it in a JSONObject. If the wrapping fails, then null is returned.
+     *
+     * @param object The object to wrap
      *
-     * @param object
-     *            The object to wrap
      * @return The wrapped value
      */
     public static Object wrap(final Object object) {
@@ -653,8 +585,7 @@ public class JSONObject {
                 return object.toString();
             }
             return new JSONObject(object);
-        }
-        catch (final Exception exception) {
+        } catch (final Exception exception) {
             return null;
         }
     }
@@ -662,39 +593,29 @@ public class JSONObject {
     static final Writer writeValue(final Writer writer, final Object value, final int indentFactor, final int indent) throws JSONException, IOException {
         if ((value == null) || value.equals(null)) {
             writer.write("null");
-        }
-        else if (value instanceof JSONObject) {
+        } else if (value instanceof JSONObject) {
             ((JSONObject) value).write(writer, indentFactor, indent);
-        }
-        else if (value instanceof JSONArray) {
+        } else if (value instanceof JSONArray) {
             ((JSONArray) value).write(writer, indentFactor, indent);
-        }
-        else if (value instanceof Map) {
+        } else if (value instanceof Map) {
             new JSONObject((Map) value).write(writer, indentFactor, indent);
-        }
-        else if (value instanceof Collection) {
+        } else if (value instanceof Collection) {
             new JSONArray((Collection) value).write(writer, indentFactor, indent);
-        }
-        else if (value.getClass().isArray()) {
+        } else if (value.getClass().isArray()) {
             new JSONArray(value).write(writer, indentFactor, indent);
-        }
-        else if (value instanceof Number) {
+        } else if (value instanceof Number) {
             writer.write(numberToString((Number) value));
-        }
-        else if (value instanceof Boolean) {
+        } else if (value instanceof Boolean) {
             writer.write(value.toString());
-        }
-        else if (value instanceof JSONString) {
+        } else if (value instanceof JSONString) {
             Object o;
             try {
                 o = ((JSONString) value).toJSONString();
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 throw new JSONException(e);
             }
             writer.write(o != null ? o.toString() : quote(value.toString()));
-        }
-        else {
+        } else {
             quote(value.toString(), writer);
         }
         return writer;
@@ -707,64 +628,53 @@ public class JSONObject {
     }
 
     /**
-     * Accumulate values under a key. It is similar to the put method except
-     * that if there is already an object stored under the key then a JSONArray
-     * is stored under the key to hold all of the accumulated values. If there
-     * is already a JSONArray, then the new value is appended to it. In
-     * contrast, the put method replaces the previous value.
+     * Accumulate values under a key. It is similar to the put method except that if there is already an object stored
+     * under the key then a JSONArray is stored under the key to hold all of the accumulated values. If there is already
+     * a JSONArray, then the new value is appended to it. In contrast, the put method replaces the previous value.
      * 

-     * If only one value is accumulated that is not a JSONArray, then the result
-     * will be the same as using put. But if multiple values are accumulated,
-     * then the result will be like append.
+     * If only one value is accumulated that is not a JSONArray, then the result will be the same as using put. But if
+     * multiple values are accumulated, then the result will be like append.
+     *
+     * @param key   A key string.
+     * @param value An object to be accumulated under the key.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            An object to be accumulated under the key.
      * @return this.
-     * @throws JSONException
-     *             If the value is an invalid number or if the key is null.
+     *
+     * @throws JSONException If the value is an invalid number or if the key is null.
      */
     public JSONObject accumulate(final String key, final Object value) throws JSONException {
         testValidity(value);
         final Object object = this.opt(key);
         if (object == null) {
             this.put(key, value instanceof JSONArray ? new JSONArray().put(value) : value);
-        }
-        else if (object instanceof JSONArray) {
+        } else if (object instanceof JSONArray) {
             ((JSONArray) object).put(value);
-        }
-        else {
+        } else {
             this.put(key, new JSONArray().put(object).put(value));
         }
         return this;
     }
 
     /**
-     * Append values to the array under a key. If the key does not exist in the
-     * JSONObject, then the key is put in the JSONObject with its value being a
-     * JSONArray containing the value parameter. If the key was already
-     * associated with a JSONArray, then the value parameter is appended to it.
+     * Append values to the array under a key. If the key does not exist in the JSONObject, then the key is put in the
+     * JSONObject with its value being a JSONArray containing the value parameter. If the key was already associated
+     * with a JSONArray, then the value parameter is appended to it.
+     *
+     * @param key   A key string.
+     * @param value An object to be accumulated under the key.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            An object to be accumulated under the key.
      * @return this.
-     * @throws JSONException
-     *             If the key is null or if the current value associated with
-     *             the key is not a JSONArray.
+     *
+     * @throws JSONException If the key is null or if the current value associated with the key is not a JSONArray.
      */
     public JSONObject append(final String key, final Object value) throws JSONException {
         testValidity(value);
         final Object object = this.opt(key);
         if (object == null) {
             this.put(key, new JSONArray().put(value));
-        }
-        else if (object instanceof JSONArray) {
+        } else if (object instanceof JSONArray) {
             this.put(key, ((JSONArray) object).put(value));
-        }
-        else {
+        } else {
             throw new JSONException("JSONObject[" + key + "] is not a JSONArray.");
         }
         return this;
@@ -773,11 +683,11 @@ public class JSONObject {
     /**
      * Get the value object associated with a key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return The object associated with the key.
-     * @throws JSONException
-     *             if the key is not found.
+     *
+     * @throws JSONException if the key is not found.
      */
     public Object get(final String key) throws JSONException {
         if (key == null) {
@@ -793,19 +703,17 @@ public class JSONObject {
     /**
      * Get the boolean value associated with a key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return The truth.
-     * @throws JSONException
-     *             if the value is not a Boolean or the String "true" or
-     *             "false".
+     *
+     * @throws JSONException if the value is not a Boolean or the String "true" or "false".
      */
     public boolean getBoolean(final String key) throws JSONException {
         final Object object = this.get(key);
         if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("false"))) {
             return false;
-        }
-        else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("true"))) {
+        } else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("true"))) {
             return true;
         }
         throw new JSONException("JSONObject[" + quote(key) + "] is not a Boolean.");
@@ -814,19 +722,18 @@ public class JSONObject {
     /**
      * Get the double value associated with a key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return The numeric value.
-     * @throws JSONException
-     *             if the key is not found or if the value is not a Number
-     *             object and cannot be converted to a number.
+     *
+     * @throws JSONException if the key is not found or if the value is not a Number object and cannot be converted to a
+     *                       number.
      */
     public double getDouble(final String key) throws JSONException {
         final Object object = this.get(key);
         try {
             return object instanceof Number ? ((Number) object).doubleValue() : Double.parseDouble((String) object);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             throw new JSONException("JSONObject[" + quote(key) + "] is not a number.");
         }
     }
@@ -834,19 +741,17 @@ public class JSONObject {
     /**
      * Get the int value associated with a key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return The integer value.
-     * @throws JSONException
-     *             if the key is not found or if the value cannot be converted
-     *             to an integer.
+     *
+     * @throws JSONException if the key is not found or if the value cannot be converted to an integer.
      */
     public int getInt(final String key) throws JSONException {
         final Object object = this.get(key);
         try {
             return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             throw new JSONException("JSONObject[" + quote(key) + "] is not an int.");
         }
     }
@@ -854,11 +759,11 @@ public class JSONObject {
     /**
      * Get the JSONArray value associated with a key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return A JSONArray which is the value.
-     * @throws JSONException
-     *             if the key is not found or if the value is not a JSONArray.
+     *
+     * @throws JSONException if the key is not found or if the value is not a JSONArray.
      */
     public JSONArray getJSONArray(final String key) throws JSONException {
         final Object object = this.get(key);
@@ -871,11 +776,11 @@ public class JSONObject {
     /**
      * Get the JSONObject value associated with a key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return A JSONObject which is the value.
-     * @throws JSONException
-     *             if the key is not found or if the value is not a JSONObject.
+     *
+     * @throws JSONException if the key is not found or if the value is not a JSONObject.
      */
     public JSONObject getJSONObject(final String key) throws JSONException {
         final Object object = this.get(key);
@@ -888,19 +793,17 @@ public class JSONObject {
     /**
      * Get the long value associated with a key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return The long value.
-     * @throws JSONException
-     *             if the key is not found or if the value cannot be converted
-     *             to a long.
+     *
+     * @throws JSONException if the key is not found or if the value cannot be converted to a long.
      */
     public long getLong(final String key) throws JSONException {
         final Object object = this.get(key);
         try {
             return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             throw new JSONException("JSONObject[" + quote(key) + "] is not a long.");
         }
     }
@@ -908,11 +811,11 @@ public class JSONObject {
     /**
      * Get the string associated with a key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return A string which is the value.
-     * @throws JSONException
-     *             if there is no string value for the key.
+     *
+     * @throws JSONException if there is no string value for the key.
      */
     public String getString(final String key) throws JSONException {
         final Object object = this.get(key);
@@ -925,8 +828,8 @@ public class JSONObject {
     /**
      * Determine if the JSONObject contains a specific key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return true if the key exists in the JSONObject.
      */
     public boolean has(final String key) {
@@ -934,48 +837,40 @@ public class JSONObject {
     }
 
     /**
-     * Increment a property of a JSONObject. If there is no such property,
-     * create one with a value of 1. If there is such a property, and if it is
-     * an Integer, Long, Double, or Float, then add one to it.
+     * Increment a property of a JSONObject. If there is no such property, create one with a value of 1. If there is
+     * such a property, and if it is an Integer, Long, Double, or Float, then add one to it.
+     *
+     * @param key A key string.
      *
-     * @param key
-     *            A key string.
      * @return this.
-     * @throws JSONException
-     *             If there is already a property with this name that is not an
-     *             Integer, Long, Double, or Float.
+     *
+     * @throws JSONException If there is already a property with this name that is not an Integer, Long, Double, or
+     *                       Float.
      */
     public JSONObject increment(final String key) throws JSONException {
         final Object value = this.opt(key);
         if (value == null) {
             this.put(key, 1);
-        }
-        else if (value instanceof Integer) {
+        } else if (value instanceof Integer) {
             this.put(key, (Integer) value + 1);
-        }
-        else if (value instanceof Long) {
+        } else if (value instanceof Long) {
             this.put(key, (Long) value + 1);
-        }
-        else if (value instanceof Double) {
+        } else if (value instanceof Double) {
             this.put(key, (Double) value + 1);
-        }
-        else if (value instanceof Float) {
+        } else if (value instanceof Float) {
             this.put(key, (Float) value + 1);
-        }
-        else {
+        } else {
             throw new JSONException("Unable to increment [" + quote(key) + "].");
         }
         return this;
     }
 
     /**
-     * Determine if the value associated with the key is null or if there is no
-     * value.
+     * Determine if the value associated with the key is null or if there is no value.
      *
-     * @param key
-     *            A key string.
-     * @return true if there is no value associated with the key or if the value
-     *         is the JSONObject.NULL object.
+     * @param key A key string.
+     *
+     * @return true if there is no value associated with the key or if the value is the JSONObject.NULL object.
      */
     public boolean isNull(final String key) {
         return JSONObject.NULL.equals(this.opt(key));
@@ -1009,11 +904,9 @@ public class JSONObject {
     }
 
     /**
-     * Produce a JSONArray containing the names of the elements of this
-     * JSONObject.
+     * Produce a JSONArray containing the names of the elements of this JSONObject.
      *
-     * @return A JSONArray containing the key strings, or null if the JSONObject
-     *         is empty.
+     * @return A JSONArray containing the key strings, or null if the JSONObject is empty.
      */
     public JSONArray names() {
         final JSONArray ja = new JSONArray();
@@ -1027,8 +920,8 @@ public class JSONObject {
     /**
      * Get an optional value associated with a key.
      *
-     * @param key
-     *            A key string.
+     * @param key A key string.
+     *
      * @return An object which is the value, or null if there is no value.
      */
     public Object opt(final String key) {
@@ -1036,11 +929,11 @@ public class JSONObject {
     }
 
     /**
-     * Get an optional boolean associated with a key. It returns false if there
-     * is no such key, or if the value is not Boolean.TRUE or the String "true".
+     * Get an optional boolean associated with a key. It returns false if there is no such key, or if the value is not
+     * Boolean.TRUE or the String "true".
+     *
+     * @param key A key string.
      *
-     * @param key
-     *            A key string.
      * @return The truth.
      */
     public boolean optBoolean(final String key) {
@@ -1048,32 +941,28 @@ public class JSONObject {
     }
 
     /**
-     * Get an optional boolean associated with a key. It returns the
-     * defaultValue if there is no such key, or if it is not a Boolean or the
-     * String "true" or "false" (case insensitive).
+     * Get an optional boolean associated with a key. It returns the defaultValue if there is no such key, or if it is
+     * not a Boolean or the String "true" or "false" (case insensitive).
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
      *
-     * @param key
-     *            A key string.
-     * @param defaultValue
-     *            The default.
      * @return The truth.
      */
     public boolean optBoolean(final String key, final boolean defaultValue) {
         try {
             return this.getBoolean(key);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return defaultValue;
         }
     }
 
     /**
-     * Get an optional double associated with a key, or NaN if there is no such
-     * key or if its value is not a number. If the value is a string, an attempt
-     * will be made to evaluate it as a number.
+     * Get an optional double associated with a key, or NaN if there is no such key or if its value is not a number. If
+     * the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key A string which is the key.
      *
-     * @param key
-     *            A string which is the key.
      * @return An object which is the value.
      */
     public double optDouble(final String key) {
@@ -1081,32 +970,28 @@ public class JSONObject {
     }
 
     /**
-     * Get an optional double associated with a key, or the defaultValue if
-     * there is no such key or if its value is not a number. If the value is a
-     * string, an attempt will be made to evaluate it as a number.
+     * Get an optional double associated with a key, or the defaultValue if there is no such key or if its value is not
+     * a number. If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
      *
-     * @param key
-     *            A key string.
-     * @param defaultValue
-     *            The default.
      * @return An object which is the value.
      */
     public double optDouble(final String key, final double defaultValue) {
         try {
             return this.getDouble(key);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return defaultValue;
         }
     }
 
     /**
-     * Get an optional int value associated with a key, or zero if there is no
-     * such key or if the value is not a number. If the value is a string, an
-     * attempt will be made to evaluate it as a number.
+     * Get an optional int value associated with a key, or zero if there is no such key or if the value is not a number.
+     * If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key A key string.
      *
-     * @param key
-     *            A key string.
      * @return An object which is the value.
      */
     public int optInt(final String key) {
@@ -1114,31 +999,28 @@ public class JSONObject {
     }
 
     /**
-     * Get an optional int value associated with a key, or the default if there
-     * is no such key or if the value is not a number. If the value is a string,
-     * an attempt will be made to evaluate it as a number.
+     * Get an optional int value associated with a key, or the default if there is no such key or if the value is not a
+     * number. If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
      *
-     * @param key
-     *            A key string.
-     * @param defaultValue
-     *            The default.
      * @return An object which is the value.
      */
     public int optInt(final String key, final int defaultValue) {
         try {
             return this.getInt(key);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return defaultValue;
         }
     }
 
     /**
-     * Get an optional JSONArray associated with a key. It returns null if there
-     * is no such key, or if its value is not a JSONArray.
+     * Get an optional JSONArray associated with a key. It returns null if there is no such key, or if its value is not
+     * a JSONArray.
+     *
+     * @param key A key string.
      *
-     * @param key
-     *            A key string.
      * @return A JSONArray which is the value.
      */
     public JSONArray optJSONArray(final String key) {
@@ -1147,11 +1029,11 @@ public class JSONObject {
     }
 
     /**
-     * Get an optional JSONObject associated with a key. It returns null if
-     * there is no such key, or if its value is not a JSONObject.
+     * Get an optional JSONObject associated with a key. It returns null if there is no such key, or if its value is not
+     * a JSONObject.
+     *
+     * @param key A key string.
      *
-     * @param key
-     *            A key string.
      * @return A JSONObject which is the value.
      */
     public JSONObject optJSONObject(final String key) {
@@ -1160,12 +1042,11 @@ public class JSONObject {
     }
 
     /**
-     * Get an optional long value associated with a key, or zero if there is no
-     * such key or if the value is not a number. If the value is a string, an
-     * attempt will be made to evaluate it as a number.
+     * Get an optional long value associated with a key, or zero if there is no such key or if the value is not a
+     * number. If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key A key string.
      *
-     * @param key
-     *            A key string.
      * @return An object which is the value.
      */
     public long optLong(final String key) {
@@ -1173,32 +1054,28 @@ public class JSONObject {
     }
 
     /**
-     * Get an optional long value associated with a key, or the default if there
-     * is no such key or if the value is not a number. If the value is a string,
-     * an attempt will be made to evaluate it as a number.
+     * Get an optional long value associated with a key, or the default if there is no such key or if the value is not a
+     * number. If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
      *
-     * @param key
-     *            A key string.
-     * @param defaultValue
-     *            The default.
      * @return An object which is the value.
      */
     public long optLong(final String key, final long defaultValue) {
         try {
             return this.getLong(key);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return defaultValue;
         }
     }
 
     /**
-     * Get an optional string associated with a key. It returns an empty string
-     * if there is no such key. If the value is not a string and is not null,
-     * then it is converted to a string.
+     * Get an optional string associated with a key. It returns an empty string if there is no such key. If the value is
+     * not a string and is not null, then it is converted to a string.
+     *
+     * @param key A key string.
      *
-     * @param key
-     *            A key string.
      * @return A string which is the value.
      */
     public String optString(final String key) {
@@ -1206,13 +1083,11 @@ public class JSONObject {
     }
 
     /**
-     * Get an optional string associated with a key. It returns the defaultValue
-     * if there is no such key.
+     * Get an optional string associated with a key. It returns the defaultValue if there is no such key.
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
      *
-     * @param key
-     *            A key string.
-     * @param defaultValue
-     *            The default.
      * @return A string which is the value.
      */
     public String optString(final String key, final String defaultValue) {
@@ -1236,19 +1111,16 @@ public class JSONObject {
                     if (name.startsWith("get")) {
                         if ("getClass".equals(name) || "getDeclaringClass".equals(name)) {
                             key = "";
-                        }
-                        else {
+                        } else {
                             key = name.substring(3);
                         }
-                    }
-                    else if (name.startsWith("is")) {
+                    } else if (name.startsWith("is")) {
                         key = name.substring(2);
                     }
                     if ((key.length() > 0) && Character.isUpperCase(key.charAt(0)) && (method.getParameterTypes().length == 0)) {
                         if (key.length() == 1) {
                             key = key.toLowerCase();
-                        }
-                        else if (!Character.isUpperCase(key.charAt(1))) {
+                        } else if (!Character.isUpperCase(key.charAt(1))) {
                             key = key.substring(0, 1).toLowerCase() + key.substring(1);
                         }
 
@@ -1258,8 +1130,7 @@ public class JSONObject {
                         }
                     }
                 }
-            }
-            catch (final Exception ignore) {
+            } catch (final Exception ignore) {
             }
         }
     }
@@ -1267,13 +1138,12 @@ public class JSONObject {
     /**
      * Put a key/boolean pair in the JSONObject.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            A boolean which is the value.
+     * @param key   A key string.
+     * @param value A boolean which is the value.
+     *
      * @return this.
-     * @throws JSONException
-     *             If the key is null.
+     *
+     * @throws JSONException If the key is null.
      */
     public JSONObject put(final String key, final boolean value) throws JSONException {
         this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
@@ -1281,14 +1151,13 @@ public class JSONObject {
     }
 
     /**
-     * Put a key/value pair in the JSONObject, where the value will be a
-     * JSONArray which is produced from a Collection.
+     * Put a key/value pair in the JSONObject, where the value will be a JSONArray which is produced from a Collection.
+     *
+     * @param key   A key string.
+     * @param value A Collection value.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            A Collection value.
      * @return this.
+     *
      * @throws JSONException
      */
     public JSONObject put(final String key, final Collection value) throws JSONException {
@@ -1299,13 +1168,12 @@ public class JSONObject {
     /**
      * Put a key/double pair in the JSONObject.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            A double which is the value.
+     * @param key   A key string.
+     * @param value A double which is the value.
+     *
      * @return this.
-     * @throws JSONException
-     *             If the key is null or if the number is invalid.
+     *
+     * @throws JSONException If the key is null or if the number is invalid.
      */
     public JSONObject put(final String key, final double value) throws JSONException {
         this.put(key, new Double(value));
@@ -1315,13 +1183,12 @@ public class JSONObject {
     /**
      * Put a key/int pair in the JSONObject.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            An int which is the value.
+     * @param key   A key string.
+     * @param value An int which is the value.
+     *
      * @return this.
-     * @throws JSONException
-     *             If the key is null.
+     *
+     * @throws JSONException If the key is null.
      */
     public JSONObject put(final String key, final int value) throws JSONException {
         this.put(key, new Integer(value));
@@ -1331,13 +1198,12 @@ public class JSONObject {
     /**
      * Put a key/long pair in the JSONObject.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            A long which is the value.
+     * @param key   A key string.
+     * @param value A long which is the value.
+     *
      * @return this.
-     * @throws JSONException
-     *             If the key is null.
+     *
+     * @throws JSONException If the key is null.
      */
     public JSONObject put(final String key, final long value) throws JSONException {
         this.put(key, new Long(value));
@@ -1345,14 +1211,13 @@ public class JSONObject {
     }
 
     /**
-     * Put a key/value pair in the JSONObject, where the value will be a
-     * JSONObject which is produced from a Map.
+     * Put a key/value pair in the JSONObject, where the value will be a JSONObject which is produced from a Map.
+     *
+     * @param key   A key string.
+     * @param value A Map value.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            A Map value.
      * @return this.
+     *
      * @throws JSONException
      */
     public JSONObject put(final String key, final Map value) throws JSONException {
@@ -1361,18 +1226,16 @@ public class JSONObject {
     }
 
     /**
-     * Put a key/value pair in the JSONObject. If the value is null, then the
-     * key will be removed from the JSONObject if it is present.
+     * Put a key/value pair in the JSONObject. If the value is null, then the key will be removed from the JSONObject if
+     * it is present.
+     *
+     * @param key   A key string.
+     * @param value An object which is the value. It should be of one of these types: Boolean, Double, Integer,
+     *              JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            An object which is the value. It should be of one of these
-     *            types: Boolean, Double, Integer, JSONArray, JSONObject, Long,
-     *            String, or the JSONObject.NULL object.
      * @return this.
-     * @throws JSONException
-     *             If the value is non-finite number or if the key is null.
+     *
+     * @throws JSONException If the value is non-finite number or if the key is null.
      */
     public JSONObject put(final String key, final Object value) throws JSONException {
         if (key == null) {
@@ -1381,25 +1244,22 @@ public class JSONObject {
         if (value != null) {
             testValidity(value);
             this.map.put(key, value);
-        }
-        else {
+        } else {
             this.remove(key);
         }
         return this;
     }
 
     /**
-     * Put a key/value pair in the JSONObject, but only if the key and the value
-     * are both non-null, and only if there is not already a member with that
-     * name.
+     * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null, and only if there is
+     * not already a member with that name.
+     *
+     * @param key   string
+     * @param value object
      *
-     * @param key
-     *            string
-     * @param value
-     *            object
      * @return this.
-     * @throws JSONException
-     *             if the key is a duplicate
+     *
+     * @throws JSONException if the key is a duplicate
      */
     public JSONObject putOnce(final String key, final Object value) throws JSONException {
         if ((key != null) && (value != null)) {
@@ -1412,18 +1272,15 @@ public class JSONObject {
     }
 
     /**
-     * Put a key/value pair in the JSONObject, but only if the key and the value
-     * are both non-null.
+     * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null.
+     *
+     * @param key   A key string.
+     * @param value An object which is the value. It should be of one of these types: Boolean, Double, Integer,
+     *              JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
      *
-     * @param key
-     *            A key string.
-     * @param value
-     *            An object which is the value. It should be of one of these
-     *            types: Boolean, Double, Integer, JSONArray, JSONObject, Long,
-     *            String, or the JSONObject.NULL object.
      * @return this.
-     * @throws JSONException
-     *             If the value is a non-finite number.
+     *
+     * @throws JSONException If the value is a non-finite number.
      */
     public JSONObject putOpt(final String key, final Object value) throws JSONException {
         if ((key != null) && (value != null)) {
@@ -1435,22 +1292,20 @@ public class JSONObject {
     /**
      * Remove a name and its value, if present.
      *
-     * @param key
-     *            The name to be removed.
-     * @return The value that was associated with the name, or null if there was
-     *         no value.
+     * @param key The name to be removed.
+     *
+     * @return The value that was associated with the name, or null if there was no value.
      */
     public Object remove(final String key) {
         return this.map.remove(key);
     }
 
     /**
-     * Determine if two JSONObjects are similar.
-     * They must contain the same set of names which must be associated with
+     * Determine if two JSONObjects are similar. They must contain the same set of names which must be associated with
      * similar values.
      *
-     * @param other
-     *            The other JSONObject
+     * @param other The other JSONObject
+     *
      * @return true if they are equal
      */
     public boolean similar(final Object other) {
@@ -1469,33 +1324,29 @@ public class JSONObject {
                     if (!((JSONObject) valueThis).similar(valueOther)) {
                         return false;
                     }
-                }
-                else if (valueThis instanceof JSONArray) {
+                } else if (valueThis instanceof JSONArray) {
                     if (!((JSONArray) valueThis).similar(valueOther)) {
                         return false;
                     }
-                }
-                else if (!valueThis.equals(valueOther)) {
+                } else if (!valueThis.equals(valueOther)) {
                     return false;
                 }
             }
             return true;
-        }
-        catch (final Throwable exception) {
+        } catch (final Throwable exception) {
             return false;
         }
     }
 
     /**
-     * Produce a JSONArray containing the values of the members of this
-     * JSONObject.
+     * Produce a JSONArray containing the values of the members of this JSONObject.
+     *
+     * @param names A JSONArray containing a list of key strings. This determines the sequence of the values in the
+     *              result.
      *
-     * @param names
-     *            A JSONArray containing a list of key strings. This determines
-     *            the sequence of the values in the result.
      * @return A JSONArray of values.
-     * @throws JSONException
-     *             If any of the values are non-finite numbers.
+     *
+     * @throws JSONException If any of the values are non-finite numbers.
      */
     public JSONArray toJSONArray(final JSONArray names) throws JSONException {
         if ((names == null) || (names.length() == 0)) {
@@ -1509,23 +1360,20 @@ public class JSONObject {
     }
 
     /**
-     * Make a JSON text of this JSONObject. For compactness, no whitespace is
-     * added. If this would not result in a syntactically correct JSON text,
-     * then null will be returned instead.
+     * Make a JSON text of this JSONObject. For compactness, no whitespace is added. If this would not result in a
+     * syntactically correct JSON text, then null will be returned instead.
      * 

      * Warning: This method assumes that the data structure is acyclical.
      *
-     * @return a printable, displayable, portable, transmittable representation
-     *         of the object, beginning with { (left
-     *         brace) and ending with } (right
-     *         brace).
+     * @return a printable, displayable, portable, transmittable representation of the object, beginning with
+     * { (left brace) and ending with } (right
+     * brace).
      */
     @Override
     public String toString() {
         try {
             return this.toString(0);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return null;
         }
     }
@@ -1535,14 +1383,13 @@ public class JSONObject {
      * 

      * Warning: This method assumes that the data structure is acyclical.
      *
-     * @param indentFactor
-     *            The number of spaces to add to each level of indentation.
-     * @return a printable, displayable, portable, transmittable representation
-     *         of the object, beginning with { (left
-     *         brace) and ending with } (right
-     *         brace).
-     * @throws JSONException
-     *             If the object contains an invalid number.
+     * @param indentFactor The number of spaces to add to each level of indentation.
+     *
+     * @return a printable, displayable, portable, transmittable representation of the object, beginning with
+     * { (left brace) and ending with } (right
+     * brace).
+     *
+     * @throws JSONException If the object contains an invalid number.
      */
     public String toString(final int indentFactor) throws JSONException {
         final StringWriter w = new StringWriter();
@@ -1552,12 +1399,12 @@ public class JSONObject {
     }
 
     /**
-     * Write the contents of the JSONObject as JSON text to a writer. For
-     * compactness, no whitespace is added.
+     * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
      * 

      * Warning: This method assumes that the data structure is acyclical.
      *
      * @return The writer.
+     *
      * @throws JSONException
      */
     public Writer write(final Writer writer) throws JSONException {
@@ -1565,12 +1412,12 @@ public class JSONObject {
     }
 
     /**
-     * Write the contents of the JSONObject as JSON text to a writer. For
-     * compactness, no whitespace is added.
+     * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
      * 

      * Warning: This method assumes that the data structure is acyclical.
      *
      * @return The writer.
+     *
      * @throws JSONException
      */
     Writer write(final Writer writer, final int indentFactor, final int indent) throws JSONException {
@@ -1588,8 +1435,7 @@ public class JSONObject {
                     writer.write(' ');
                 }
                 writeValue(writer, this.map.get(key), indentFactor, indent);
-            }
-            else if (length != 0) {
+            } else if (length != 0) {
                 final int newindent = indent + indentFactor;
                 while (keys.hasNext()) {
                     final Object key = keys.next();
@@ -1615,22 +1461,19 @@ public class JSONObject {
             }
             writer.write('}');
             return writer;
-        }
-        catch (final IOException exception) {
+        } catch (final IOException exception) {
             throw new JSONException(exception);
         }
     }
 
     /**
-     * JSONObject.NULL is equivalent to the value that JavaScript calls null,
-     * whilst Java's null is equivalent to the value that JavaScript calls
-     * undefined.
+     * JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst Java's null is equivalent to the
+     * value that JavaScript calls undefined.
      */
     private static final class Null {
 
         /**
-         * There is only intended to be a single instance of the NULL object,
-         * so the clone method returns itself.
+         * There is only intended to be a single instance of the NULL object, so the clone method returns itself.
          *
          * @return NULL.
          */
@@ -1638,8 +1481,7 @@ public class JSONObject {
         protected final Object clone() {
             try {
                 return super.clone();
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 return this;
             }
         }
@@ -1647,10 +1489,9 @@ public class JSONObject {
         /**
          * A Null object is equal to the null value and to itself.
          *
-         * @param object
-         *            An object to test for nullness.
-         * @return true if the object parameter is the JSONObject.NULL object or
-         *         null.
+         * @param object An object to test for nullness.
+         *
+         * @return true if the object parameter is the JSONObject.NULL object or null.
          */
         @Override
         public boolean equals(final Object object) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONString.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONString.java
index 9e97b4512..2cf8273a9 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONString.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONString.java
@@ -1,18 +1,14 @@
 package com.intellectualcrafters.json;
 
 /**
- * The JSONString interface allows a toJSONString()
- * method so that a class can change the behavior of
- * JSONObject.toString(), JSONArray.toString(),
- * and JSONWriter.value(Object). The
- * toJSONString method will be used instead of the default behavior
- * of using the Object's toString() method and quoting the result.
+ * The JSONString interface allows a toJSONString() method so that a class can change the
+ * behavior of JSONObject.toString(), JSONArray.toString(), and
+ * JSONWriter.value(Object). The toJSONString method will be used instead of the
+ * default behavior of using the Object's toString() method and quoting the result.
  */
 public interface JSONString {
     /**
-     * The toJSONString method allows a class to produce its own
-     * JSON
-     * serialization.
+     * The toJSONString method allows a class to produce its own JSON serialization.
      *
      * @return A strictly syntactically correct JSON text.
      */
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONStringer.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONStringer.java
index 729bd016d..053001408 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONStringer.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONStringer.java
@@ -3,34 +3,30 @@ package com.intellectualcrafters.json;
 import java.io.StringWriter;
 
 /**
- * JSONStringer provides a quick and convenient way of producing JSON text.
- * The texts produced strictly conform to JSON syntax rules. No whitespace is
- * added, so the results are ready for transmission or storage. Each instance of
+ * JSONStringer provides a quick and convenient way of producing JSON text. The texts produced strictly conform to JSON
+ * syntax rules. No whitespace is added, so the results are ready for transmission or storage. Each instance of
  * JSONStringer can produce one JSON text.
  * 

- * A JSONStringer instance provides a value method for appending
- * values to the text, and a key method for adding keys before
- * values in objects. There are array and endArray
- * methods that make and bound array values, and object and
- * endObject methods which make and bound object values. All of
- * these methods return the JSONWriter instance, permitting cascade style. For
- * example,
+ * A JSONStringer instance provides a value method for appending values to the text, and a key
+ * method for adding keys before values in objects. There are array and endArray methods that
+ * make and bound array values, and object and endObject methods which make and bound object
+ * values. All of these methods return the JSONWriter instance, permitting cascade style. For example,
+ * 

  * 

- *
  * 
- * myString = new JSONStringer().object().key("JSON").value("Hello, World!").endObject().toString();
+ * myString = new JSONStringer().object().key("JSON").value("Hello,
+ * World!").endObject().toString();
  * 

  * 

  * which produces the string
  * 

- *
+ * 

  * 
  * {"JSON":"Hello, World!"}
  * 

  * 

- * The first method called must be array or object.
- * There are no methods for adding commas or colons. JSONStringer adds them for
- * you. Objects and arrays can be nested up to 20 levels deep.
+ * The first method called must be array or object. There are no methods for adding commas or
+ * colons. JSONStringer adds them for you. Objects and arrays can be nested up to 20 levels deep.
  * 

  * This can sometimes be easier than using a JSONObject to build a string.
  *
@@ -46,11 +42,9 @@ public class JSONStringer extends JSONWriter {
     }
 
     /**
-     * Return the JSON text. This method is used to obtain the product of the
-     * JSONStringer instance. It will return null if there was a
-     * problem in the construction of the JSON text (such as the calls to
-     * array were not properly balanced with calls to
-     * endArray).
+     * Return the JSON text. This method is used to obtain the product of the JSONStringer instance. It will return
+     * null if there was a problem in the construction of the JSON text (such as the calls to
+     * array were not properly balanced with calls to endArray).
      *
      * @return The JSON text.
      */
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONTokener.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONTokener.java
index ef16678c0..16feba806 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONTokener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONTokener.java
@@ -1,16 +1,10 @@
 package com.intellectualcrafters.json;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
+import java.io.*;
 
 /**
- * A JSONTokener takes a source string and extracts characters and tokens from
- * it. It is used by the JSONObject and JSONArray constructors to parse
- * JSON source strings.
+ * A JSONTokener takes a source string and extracts characters and tokens from it. It is used by the JSONObject and
+ * JSONArray constructors to parse JSON source strings.
  *
  * @author JSON.org
  * @version 2014-05-03
@@ -18,18 +12,17 @@ import java.io.StringReader;
 public class JSONTokener {
 
     private final Reader reader;
-    private long         character;
-    private boolean      eof;
-    private long         index;
-    private long         line;
-    private char         previous;
-    private boolean      usePrevious;
+    private long character;
+    private boolean eof;
+    private long index;
+    private long line;
+    private char previous;
+    private boolean usePrevious;
 
     /**
      * Construct a JSONTokener from a Reader.
      *
-     * @param reader
-     *            A reader.
+     * @param reader A reader.
      */
     public JSONTokener(final Reader reader) {
         this.reader = reader.markSupported() ? reader : new BufferedReader(reader);
@@ -44,8 +37,7 @@ public class JSONTokener {
     /**
      * Construct a JSONTokener from an InputStream.
      *
-     * @param inputStream
-     *            The source.
+     * @param inputStream The source.
      */
     public JSONTokener(final InputStream inputStream) throws JSONException {
         this(new InputStreamReader(inputStream));
@@ -54,8 +46,7 @@ public class JSONTokener {
     /**
      * Construct a JSONTokener from a string.
      *
-     * @param s
-     *            A source string.
+     * @param s A source string.
      */
     public JSONTokener(final String s) {
         this(new StringReader(s));
@@ -64,9 +55,8 @@ public class JSONTokener {
     /**
      * Get the hex value of a character (base16).
      *
-     * @param c
-     *            A character between '0' and '9' or between 'A' and 'F' or
-     *            between 'a' and 'f'.
+     * @param c A character between '0' and '9' or between 'A' and 'F' or between 'a' and 'f'.
+     *
      * @return An int between 0 and 15, or -1 if c was not a hex digit.
      */
     public static int dehexchar(final char c) {
@@ -83,9 +73,8 @@ public class JSONTokener {
     }
 
     /**
-     * Back up one character. This provides a sort of lookahead capability,
-     * so that you can test for a digit or letter before attempting to parse
-     * the next number or identifier.
+     * Back up one character. This provides a sort of lookahead capability, so that you can test for a digit or letter
+     * before attempting to parse the next number or identifier.
      */
     public void back() throws JSONException {
         if (this.usePrevious || (this.index <= 0)) {
@@ -102,8 +91,7 @@ public class JSONTokener {
     }
 
     /**
-     * Determine if the source string still contains characters that next()
-     * can consume.
+     * Determine if the source string still contains characters that next() can consume.
      *
      * @return true if not yet at the end of the source.
      */
@@ -126,12 +114,10 @@ public class JSONTokener {
         if (this.usePrevious) {
             this.usePrevious = false;
             c = this.previous;
-        }
-        else {
+        } else {
             try {
                 c = this.reader.read();
-            }
-            catch (final IOException exception) {
+            } catch (final IOException exception) {
                 throw new JSONException(exception);
             }
 
@@ -144,12 +130,10 @@ public class JSONTokener {
         if (this.previous == '\r') {
             this.line += 1;
             this.character = c == '\n' ? 0 : 1;
-        }
-        else if (c == '\n') {
+        } else if (c == '\n') {
             this.line += 1;
             this.character = 0;
-        }
-        else {
+        } else {
             this.character += 1;
         }
         this.previous = (char) c;
@@ -157,14 +141,13 @@ public class JSONTokener {
     }
 
     /**
-     * Consume the next character, and check that it matches a specified
-     * character.
+     * Consume the next character, and check that it matches a specified character.
+     *
+     * @param c The character to match.
      *
-     * @param c
-     *            The character to match.
      * @return The character.
-     * @throws JSONException
-     *             if the character does not match.
+     *
+     * @throws JSONException if the character does not match.
      */
     public char next(final char c) throws JSONException {
         final char n = this.next();
@@ -177,12 +160,11 @@ public class JSONTokener {
     /**
      * Get the next n characters.
      *
-     * @param n
-     *            The number of characters to take.
+     * @param n The number of characters to take.
+     *
      * @return A string of n characters.
-     * @throws JSONException
-     *             Substring bounds error if there are not
-     *             n characters remaining in the source string.
+     *
+     * @throws JSONException Substring bounds error if there are not n characters remaining in the source string.
      */
     public String next(final int n) throws JSONException {
         if (n == 0) {
@@ -206,10 +188,11 @@ public class JSONTokener {
      * Get the next char in the string, skipping whitespace.
      *
      * @return A character, or 0 if there are no more characters.
+     *
      * @throws JSONException
      */
     public char nextClean() throws JSONException {
-        for (;;) {
+        for (; ; ) {
             final char c = this.next();
             if ((c == 0) || (c > ' ')) {
                 return c;
@@ -218,23 +201,20 @@ public class JSONTokener {
     }
 
     /**
-     * Return the characters up to the next close quote character.
-     * Backslash processing is done. The formal JSON format does not
-     * allow strings in single quotes, but an implementation is allowed to
-     * accept them.
+     * Return the characters up to the next close quote character. Backslash processing is done. The formal JSON format
+     * does not allow strings in single quotes, but an implementation is allowed to accept them.
+     *
+     * @param quote The quoting character, either "  (double quote) or '
+     *               (single quote).
      *
-     * @param quote
-     *            The quoting character, either "
-     *             (double quote) or '
-     *             (single quote).
      * @return A String.
-     * @throws JSONException
-     *             Unterminated string.
+     *
+     * @throws JSONException Unterminated string.
      */
     public String nextString(final char quote) throws JSONException {
         char c;
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (; ; ) {
             c = this.next();
             switch (c) {
                 case 0:
@@ -282,16 +262,15 @@ public class JSONTokener {
     }
 
     /**
-     * Get the text up but not including the specified character or the
-     * end of line, whichever comes first.
+     * Get the text up but not including the specified character or the end of line, whichever comes first.
+     *
+     * @param delimiter A delimiter character.
      *
-     * @param delimiter
-     *            A delimiter character.
      * @return A string.
      */
     public String nextTo(final char delimiter) throws JSONException {
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (; ; ) {
             final char c = this.next();
             if ((c == delimiter) || (c == 0) || (c == '\n') || (c == '\r')) {
                 if (c != 0) {
@@ -304,17 +283,17 @@ public class JSONTokener {
     }
 
     /**
-     * Get the text up but not including one of the specified delimiter
-     * characters or the end of line, whichever comes first.
+     * Get the text up but not including one of the specified delimiter characters or the end of line, whichever comes
+     * first.
+     *
+     * @param delimiters A set of delimiter characters.
      *
-     * @param delimiters
-     *            A set of delimiter characters.
      * @return A string, trimmed.
      */
     public String nextTo(final String delimiters) throws JSONException {
         char c;
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (; ; ) {
             c = this.next();
             if ((delimiters.indexOf(c) >= 0) || (c == 0) || (c == '\n') || (c == '\r')) {
                 if (c != 0) {
@@ -327,12 +306,12 @@ public class JSONTokener {
     }
 
     /**
-     * Get the next value. The value can be a Boolean, Double, Integer,
-     * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
+     * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+     * JSONObject.NULL object.
      *
      * @return An object.
-     * @throws JSONException
-     *             If syntax error.
+     *
+     * @throws JSONException If syntax error.
      */
     public Object nextValue() throws JSONException {
         char c = this.nextClean();
@@ -373,13 +352,12 @@ public class JSONTokener {
     }
 
     /**
-     * Skip characters until the next character is the requested character.
-     * If the requested character is not found, no characters are skipped.
+     * Skip characters until the next character is the requested character. If the requested character is not found, no
+     * characters are skipped.
      *
-     * @param to
-     *            A character to skip to.
-     * @return The requested character, or zero if the requested character
-     *         is not found.
+     * @param to A character to skip to.
+     *
+     * @return The requested character, or zero if the requested character is not found.
      */
     public char skipTo(final char to) throws JSONException {
         char c;
@@ -397,10 +375,8 @@ public class JSONTokener {
                     this.line = startLine;
                     return c;
                 }
-            }
-            while (c != to);
-        }
-        catch (final IOException exception) {
+            } while (c != to);
+        } catch (final IOException exception) {
             throw new JSONException(exception);
         }
         this.back();
@@ -410,8 +386,8 @@ public class JSONTokener {
     /**
      * Make a JSONException to signal a syntax error.
      *
-     * @param message
-     *            The error message.
+     * @param message The error message.
+     *
      * @return A JSONException object, suitable for throwing
      */
     public JSONException syntaxError(final String message) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONWriter.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONWriter.java
index 45989c0b5..7017db3d5 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONWriter.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/JSONWriter.java
@@ -4,34 +4,29 @@ import java.io.IOException;
 import java.io.Writer;
 
 /**
- * JSONWriter provides a quick and convenient way of producing JSON text.
- * The texts produced strictly conform to JSON syntax rules. No whitespace is
- * added, so the results are ready for transmission or storage. Each instance of
+ * JSONWriter provides a quick and convenient way of producing JSON text. The texts produced strictly conform to JSON
+ * syntax rules. No whitespace is added, so the results are ready for transmission or storage. Each instance of
  * JSONWriter can produce one JSON text.
  * 

- * A JSONWriter instance provides a value method for appending
- * values to the text, and a key method for adding keys before
- * values in objects. There are array and endArray
- * methods that make and bound array values, and object and
- * endObject methods which make and bound object values. All of
- * these methods return the JSONWriter instance, permitting a cascade style. For
- * example,
+ * A JSONWriter instance provides a value method for appending values to the text, and a key
+ * method for adding keys before values in objects. There are array and endArray methods that
+ * make and bound array values, and object and endObject methods which make and bound object
+ * values. All of these methods return the JSONWriter instance, permitting a cascade style. For example,
+ * 

  * 

- *
  * 
  * new JSONWriter(myWriter).object().key("JSON").value("Hello, World!").endObject();
  * 

  * 

  * which writes
  * 

- *
+ * 

  * 
  * {"JSON":"Hello, World!"}
  * 

  * 

- * The first method called must be array or object.
- * There are no methods for adding commas or colons. JSONWriter adds them for
- * you. Objects and arrays can be nested up to 20 levels deep.
+ * The first method called must be array or object. There are no methods for adding commas or
+ * colons. JSONWriter adds them for you. Objects and arrays can be nested up to 20 levels deep.
  * 

  * This can sometimes be easier than using a JSONObject to build a string.
  *
@@ -43,29 +38,23 @@ public class JSONWriter {
     /**
      * The writer that will receive the output.
      */
-    protected final Writer   writer;
+    protected final Writer writer;
     /**
      * The object/array stack.
      */
     private final JSONObject stack[];
     /**
-     * The current mode. Values:
-     * 'a' (array),
-     * 'd' (done),
-     * 'i' (initial),
-     * 'k' (key),
-     * 'o' (object).
+     * The current mode. Values: 'a' (array), 'd' (done), 'i' (initial), 'k' (key), 'o' (object).
      */
-    protected char           mode;
+    protected char mode;
     /**
-     * The comma flag determines if a comma should be output before the next
-     * value.
+     * The comma flag determines if a comma should be output before the next value.
      */
-    private boolean          comma;
+    private boolean comma;
     /**
      * The stack top index. A value of 0 indicates that the stack is empty.
      */
-    private int              top;
+    private int top;
 
     /**
      * Make a fresh JSONWriter. It can be used to build one JSON text.
@@ -81,11 +70,11 @@ public class JSONWriter {
     /**
      * Append a value.
      *
-     * @param string
-     *            A string value.
+     * @param string A string value.
+     *
      * @return this
-     * @throws JSONException
-     *             If the value is out of sequence.
+     *
+     * @throws JSONException If the value is out of sequence.
      */
     private JSONWriter append(final String string) throws JSONException {
         if (string == null) {
@@ -97,8 +86,7 @@ public class JSONWriter {
                     this.writer.write(',');
                 }
                 this.writer.write(string);
-            }
-            catch (final IOException e) {
+            } catch (final IOException e) {
                 throw new JSONException(e);
             }
             if (this.mode == 'o') {
@@ -111,16 +99,13 @@ public class JSONWriter {
     }
 
     /**
-     * Begin appending a new array. All values until the balancing
-     * endArray will be appended to this array. The
-     * endArray method must be called to mark the array's end.
+     * Begin appending a new array. All values until the balancing endArray will be appended to this array.
+     * The endArray method must be called to mark the array's end.
      *
      * @return this
-     * @throws JSONException
-     *             If the nesting is too deep, or if the object is
-     *             started in the wrong place (for example as a key or after the
-     *             end of the
-     *             outermost array or object).
+     *
+     * @throws JSONException If the nesting is too deep, or if the object is started in the wrong place (for example as
+     *                       a key or after the end of the outermost array or object).
      */
     public JSONWriter array() throws JSONException {
         if ((this.mode == 'i') || (this.mode == 'o') || (this.mode == 'a')) {
@@ -135,13 +120,12 @@ public class JSONWriter {
     /**
      * End something.
      *
-     * @param mode
-     *            Mode
-     * @param c
-     *            Closing character
+     * @param mode Mode
+     * @param c    Closing character
+     *
      * @return this
-     * @throws JSONException
-     *             If unbalanced.
+     *
+     * @throws JSONException If unbalanced.
      */
     private JSONWriter end(final char mode, final char c) throws JSONException {
         if (this.mode != mode) {
@@ -150,8 +134,7 @@ public class JSONWriter {
         this.pop(mode);
         try {
             this.writer.write(c);
-        }
-        catch (final IOException e) {
+        } catch (final IOException e) {
             throw new JSONException(e);
         }
         this.comma = true;
@@ -159,39 +142,37 @@ public class JSONWriter {
     }
 
     /**
-     * End an array. This method most be called to balance calls to
-     * array.
+     * End an array. This method most be called to balance calls to array.
      *
      * @return this
-     * @throws JSONException
-     *             If incorrectly nested.
+     *
+     * @throws JSONException If incorrectly nested.
      */
     public JSONWriter endArray() throws JSONException {
         return this.end('a', ']');
     }
 
     /**
-     * End an object. This method most be called to balance calls to
-     * object.
+     * End an object. This method most be called to balance calls to object.
      *
      * @return this
-     * @throws JSONException
-     *             If incorrectly nested.
+     *
+     * @throws JSONException If incorrectly nested.
      */
     public JSONWriter endObject() throws JSONException {
         return this.end('k', '}');
     }
 
     /**
-     * Append a key. The key will be associated with the next value. In an
-     * object, every value must be preceded by a key.
+     * Append a key. The key will be associated with the next value. In an object, every value must be preceded by a
+     * key.
+     *
+     * @param string A key string.
      *
-     * @param string
-     *            A key string.
      * @return this
-     * @throws JSONException
-     *             If the key is out of place. For example, keys
-     *             do not belong in arrays or if the key is null.
+     *
+     * @throws JSONException If the key is out of place. For example, keys do not belong in arrays or if the key is
+     *                       null.
      */
     public JSONWriter key(final String string) throws JSONException {
         if (string == null) {
@@ -208,8 +189,7 @@ public class JSONWriter {
                 this.comma = false;
                 this.mode = 'o';
                 return this;
-            }
-            catch (final IOException e) {
+            } catch (final IOException e) {
                 throw new JSONException(e);
             }
         }
@@ -217,16 +197,13 @@ public class JSONWriter {
     }
 
     /**
-     * Begin appending a new object. All keys and values until the balancing
-     * endObject will be appended to this object. The
-     * endObject method must be called to mark the object's end.
+     * Begin appending a new object. All keys and values until the balancing endObject will be appended to
+     * this object. The endObject method must be called to mark the object's end.
      *
      * @return this
-     * @throws JSONException
-     *             If the nesting is too deep, or if the object is
-     *             started in the wrong place (for example as a key or after the
-     *             end of the
-     *             outermost array or object).
+     *
+     * @throws JSONException If the nesting is too deep, or if the object is started in the wrong place (for example as
+     *                       a key or after the end of the outermost array or object).
      */
     public JSONWriter object() throws JSONException {
         if (this.mode == 'i') {
@@ -245,10 +222,9 @@ public class JSONWriter {
     /**
      * Pop an array or object scope.
      *
-     * @param c
-     *            The scope to close.
-     * @throws JSONException
-     *             If nesting is wrong.
+     * @param c The scope to close.
+     *
+     * @throws JSONException If nesting is wrong.
      */
     private void pop(final char c) throws JSONException {
         if (this.top <= 0) {
@@ -265,10 +241,9 @@ public class JSONWriter {
     /**
      * Push an array or object scope.
      *
-     * @param jo
-     *            The scope to open.
-     * @throws JSONException
-     *             If nesting is too deep.
+     * @param jo The scope to open.
+     *
+     * @throws JSONException If nesting is too deep.
      */
     private void push(final JSONObject jo) throws JSONException {
         if (this.top >= maxdepth) {
@@ -280,12 +255,12 @@ public class JSONWriter {
     }
 
     /**
-     * Append either the value true or the value false
-     * .
+     * Append either the value true or the value false .
+     *
+     * @param b A boolean.
      *
-     * @param b
-     *            A boolean.
      * @return this
+     *
      * @throws JSONException
      */
     public JSONWriter value(final boolean b) throws JSONException {
@@ -295,11 +270,11 @@ public class JSONWriter {
     /**
      * Append a double value.
      *
-     * @param d
-     *            A double.
+     * @param d A double.
+     *
      * @return this
-     * @throws JSONException
-     *             If the number is not finite.
+     *
+     * @throws JSONException If the number is not finite.
      */
     public JSONWriter value(final double d) throws JSONException {
         return this.value(new Double(d));
@@ -308,9 +283,10 @@ public class JSONWriter {
     /**
      * Append a long value.
      *
-     * @param l
-     *            A long.
+     * @param l A long.
+     *
      * @return this
+     *
      * @throws JSONException
      */
     public JSONWriter value(final long l) throws JSONException {
@@ -320,13 +296,12 @@ public class JSONWriter {
     /**
      * Append an object value.
      *
-     * @param object
-     *            The object to append. It can be null, or a Boolean, Number,
-     *            String, JSONObject, or JSONArray, or an object that implements
-     *            JSONString.
+     * @param object The object to append. It can be null, or a Boolean, Number, String, JSONObject, or JSONArray, or an
+     *               object that implements JSONString.
+     *
      * @return this
-     * @throws JSONException
-     *             If the value is out of sequence.
+     *
+     * @throws JSONException If the value is out of sequence.
      */
     public JSONWriter value(final Object object) throws JSONException {
         return this.append(JSONObject.valueToString(object));
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/Kim.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/Kim.java
index 41e1b15d2..332b0083e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/Kim.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/Kim.java
@@ -1,67 +1,56 @@
 package com.intellectualcrafters.json;
 
 /**
- * Kim makes immutable eight bit Unicode strings. If the MSB of a byte is set,
- * then the next byte is a continuation byte. The last byte of a character
- * never has the MSB reset. Every byte that is not the last byte has the MSB
- * set. Kim stands for "Keep it minimal". A Unicode character is never longer
- * than 3 bytes. Every byte contributes 7 bits to the character. ASCII is
- * unmodified.
+ * Kim makes immutable eight bit Unicode strings. If the MSB of a byte is set, then the next byte is a continuation
+ * byte. The last byte of a character never has the MSB reset. Every byte that is not the last byte has the MSB set. Kim
+ * stands for "Keep it minimal". A Unicode character is never longer than 3 bytes. Every byte contributes 7 bits to the
+ * character. ASCII is unmodified.
  * 

- * Kim UTF-8 one byte U+007F U+007F two bytes U+3FFF U+07FF three bytes U+10FFF
- * U+FFFF four bytes U+10FFFF
+ * Kim UTF-8 one byte U+007F U+007F two bytes U+3FFF U+07FF three bytes U+10FFF U+FFFF four bytes U+10FFFF
  * 

- * Characters in the ranges U+0800..U+3FFF and U+10000..U+10FFFF will be one
- * byte smaller when encoded in Kim compared to UTF-8.
+ * Characters in the ranges U+0800..U+3FFF and U+10000..U+10FFFF will be one byte smaller when encoded in Kim compared
+ * to UTF-8.
  * 

- * Kim is beneficial when using scripts such as Old South Arabian, Aramaic,
- * Avestan, Balinese, Batak, Bopomofo, Buginese, Buhid, Carian, Cherokee,
- * Coptic, Cyrillic, Deseret, Egyptian Hieroglyphs, Ethiopic, Georgian,
- * Glagolitic, Gothic, Hangul Jamo, Hanunoo, Hiragana, Kanbun, Kaithi, Kannada,
- * Katakana, Kharoshthi, Khmer, Lao, Lepcha, Limbu, Lycian, Lydian, Malayalam,
- * Mandaic, Meroitic, Miao, Mongolian, Myanmar, New Tai Lue, Ol Chiki, Old
- * Turkic, Oriya, Osmanya, Pahlavi, Parthian, Phags-Pa, Phoenician, Samaritan,
- * Sharada, Sinhala, Sora Sompeng, Tagalog, Tagbanwa, Takri, Tai Le, Tai Tham,
- * Tamil, Telugu, Thai, Tibetan, Tifinagh, UCAS.
+ * Kim is beneficial when using scripts such as Old South Arabian, Aramaic, Avestan, Balinese, Batak, Bopomofo,
+ * Buginese, Buhid, Carian, Cherokee, Coptic, Cyrillic, Deseret, Egyptian Hieroglyphs, Ethiopic, Georgian, Glagolitic,
+ * Gothic, Hangul Jamo, Hanunoo, Hiragana, Kanbun, Kaithi, Kannada, Katakana, Kharoshthi, Khmer, Lao, Lepcha, Limbu,
+ * Lycian, Lydian, Malayalam, Mandaic, Meroitic, Miao, Mongolian, Myanmar, New Tai Lue, Ol Chiki, Old Turkic, Oriya,
+ * Osmanya, Pahlavi, Parthian, Phags-Pa, Phoenician, Samaritan, Sharada, Sinhala, Sora Sompeng, Tagalog, Tagbanwa,
+ * Takri, Tai Le, Tai Tham, Tamil, Telugu, Thai, Tibetan, Tifinagh, UCAS.
  * 

- * A kim object can be constructed from an ordinary UTF-16 string, or from a
- * byte array. A kim object can produce a UTF-16 string.
+ * A kim object can be constructed from an ordinary UTF-16 string, or from a byte array. A kim object can produce a
+ * UTF-16 string.
  * 

- * As with UTF-8, it is possible to detect character boundaries within a byte
- * sequence. UTF-8 is one of the world's great inventions. While Kim is more
- * efficient, it is not clear that it is worth the expense of transition.
+ * As with UTF-8, it is possible to detect character boundaries within a byte sequence. UTF-8 is one of the world's
+ * great inventions. While Kim is more efficient, it is not clear that it is worth the expense of transition.
  *
  * @version 2013-04-18
  */
 public class Kim {
 
     /**
-     * The number of bytes in the kim. The number of bytes can be as much as
-     * three times the number of characters.
+     * The number of bytes in the kim. The number of bytes can be as much as three times the number of characters.
      */
-    public int     length   = 0;
+    public int length = 0;
     /**
      * The byte array containing the kim's content.
      */
-    private byte[] bytes    = null;
+    private byte[] bytes = null;
     /**
      * The kim's hashcode, conforming to Java's hashcode conventions.
      */
-    private int    hashcode = 0;
+    private int hashcode = 0;
     /**
      * The memoization of toString().
      */
-    private String string   = null;
+    private String string = null;
 
     /**
      * Make a kim from a portion of a byte array.
      *
-     * @param bytes
-     *            A byte array.
-     * @param from
-     *            The index of the first byte.
-     * @param thru
-     *            The index of the last byte plus one.
+     * @param bytes A byte array.
+     * @param from  The index of the first byte.
+     * @param thru  The index of the last byte plus one.
      */
     public Kim(final byte[] bytes, final int from, final int thru) {
 
@@ -88,25 +77,19 @@ public class Kim {
     /**
      * Make a kim from a byte array.
      *
-     * @param bytes
-     *            The byte array.
-     * @param length
-     *            The number of bytes.
+     * @param bytes  The byte array.
+     * @param length The number of bytes.
      */
     public Kim(final byte[] bytes, final int length) {
         this(bytes, 0, length);
     }
 
     /**
-     * Make a new kim from a substring of an existing kim. The coordinates are
-     * in byte units, not character units.
+     * Make a new kim from a substring of an existing kim. The coordinates are in byte units, not character units.
      *
-     * @param kim
-     *            The source of bytes.
-     * @param from
-     *            The point at which to take bytes.
-     * @param thru
-     *            The point at which to stop taking bytes.
+     * @param kim  The source of bytes.
+     * @param from The point at which to take bytes.
+     * @param thru The point at which to stop taking bytes.
      */
     public Kim(final Kim kim, final int from, final int thru) {
         this(kim.bytes, from, thru);
@@ -115,10 +98,9 @@ public class Kim {
     /**
      * Make a kim from a string.
      *
-     * @param string
-     *            The string.
-     * @throws JSONException
-     *             if surrogate pair mismatch.
+     * @param string The string.
+     *
+     * @throws JSONException if surrogate pair mismatch.
      */
     public Kim(final String string) throws JSONException {
         final int stringLength = string.length();
@@ -133,11 +115,9 @@ public class Kim {
                 final int c = string.charAt(i);
                 if (c <= 0x7F) {
                     this.length += 1;
-                }
-                else if (c <= 0x3FFF) {
+                } else if (c <= 0x3FFF) {
                     this.length += 2;
-                }
-                else {
+                } else {
                     if ((c >= 0xD800) && (c <= 0xDFFF)) {
                         i += 1;
                         final int d = string.charAt(i);
@@ -164,8 +144,7 @@ public class Kim {
                     sum += character;
                     this.hashcode += sum;
                     at += 1;
-                }
-                else if (character <= 0x3FFF) {
+                } else if (character <= 0x3FFF) {
                     b = 0x80 | (character >>> 7);
                     this.bytes[at] = (byte) b;
                     sum += b;
@@ -176,8 +155,7 @@ public class Kim {
                     sum += b;
                     this.hashcode += sum;
                     at += 1;
-                }
-                else {
+                } else {
                     if ((character >= 0xD800) && (character <= 0xDBFF)) {
                         i += 1;
                         character = (((character & 0x3FF) << 10) | (string.charAt(i) & 0x3FF)) + 65536;
@@ -204,14 +182,13 @@ public class Kim {
     }
 
     /**
-     * Returns the number of bytes needed to contain the character in Kim
-     * format.
+     * Returns the number of bytes needed to contain the character in Kim format.
+     *
+     * @param character a Unicode character between 0 and 0x10FFFF.
      *
-     * @param character
-     *            a Unicode character between 0 and 0x10FFFF.
      * @return 1, 2, or 3
-     * @throws JSONException
-     *             if the character is not representable in a kim.
+     *
+     * @throws JSONException if the character is not representable in a kim.
      */
     public static int characterSize(final int character) throws JSONException {
         if ((character < 0) || (character > 0x10FFFF)) {
@@ -221,14 +198,12 @@ public class Kim {
     }
 
     /**
-     * Returns the character at the specified index. The index refers to byte
-     * values and ranges from 0 to length - 1. The index of the next character
-     * is at index + Kim.characterSize(kim.characterAt(index)).
+     * Returns the character at the specified index. The index refers to byte values and ranges from 0 to length - 1.
+     * The index of the next character is at index + Kim.characterSize(kim.characterAt(index)).
      *
-     * @param at
-     *            the index of the char value. The first character is at 0.
-     * @throws JSONException
-     *             if at does not point to a valid character.
+     * @param at the index of the char value. The first character is at 0.
+     *
+     * @throws JSONException if at does not point to a valid character.
      * @returns a Unicode character between 0 and 0x10FFFF.
      */
     public int characterAt(final int at) throws JSONException {
@@ -243,8 +218,7 @@ public class Kim {
             if (character > 0x7F) {
                 return character;
             }
-        }
-        else {
+        } else {
             final int c2 = get(at + 2);
             character = ((c & 0x7F) << 14) | ((c1 & 0x7F) << 7) | c2;
             if (((c2 & 0x80) == 0) && (character > 0x3FFF) && (character <= 0x10FFFF) && ((character < 0xD800) || (character > 0xDFFF))) {
@@ -257,10 +231,9 @@ public class Kim {
     /**
      * Copy the contents of this kim to a byte array.
      *
-     * @param bytes
-     *            A byte array of sufficient size.
-     * @param at
-     *            The position within the byte array to take the byes.
+     * @param bytes A byte array of sufficient size.
+     * @param at    The position within the byte array to take the byes.
+     *
      * @return The position immediately after the copy.
      */
     public int copy(final byte[] bytes, final int at) {
@@ -269,13 +242,11 @@ public class Kim {
     }
 
     /**
-     * Two kim objects containing exactly the same bytes in the same order are
-     * equal to each other.
+     * Two kim objects containing exactly the same bytes in the same order are equal to each other.
      *
-     * @param obj
-     *            the other kim with which to compare.
-     * @returns true if this and obj are both kim objects containing identical
-     *          byte sequences.
+     * @param obj the other kim with which to compare.
+     *
+     * @returns true if this and obj are both kim objects containing identical byte sequences.
      */
     @Override
     public boolean equals(final Object obj) {
@@ -295,11 +266,11 @@ public class Kim {
     /**
      * Get a byte from a kim.
      *
-     * @param at
-     *            The position of the byte. The first byte is at 0.
+     * @param at The position of the byte. The first byte is at 0.
+     *
      * @return The byte.
-     * @throws JSONException
-     *             if there is no byte at that position.
+     *
+     * @throws JSONException if there is no byte at that position.
      */
     public int get(final int at) throws JSONException {
         if ((at < 0) || (at > this.length)) {
@@ -317,13 +288,12 @@ public class Kim {
     }
 
     /**
-     * Produce a UTF-16 String from this kim. The number of codepoints in the
-     * string will not be greater than the number of bytes in the kim, although
-     * it could be less.
+     * Produce a UTF-16 String from this kim. The number of codepoints in the string will not be greater than the number
+     * of bytes in the kim, although it could be less.
      *
      * @return The string. A kim memoizes its string representation.
-     * @throws JSONException
-     *             if the kim is not valid.
+     *
+     * @throws JSONException if the kim is not valid.
      */
     @Override
     public String toString() throws JSONException {
@@ -336,8 +306,7 @@ public class Kim {
                 if (c < 0x10000) {
                     chars[length] = (char) c;
                     length += 1;
-                }
-                else {
+                } else {
                     chars[length] = (char) (0xD800 | ((c - 0x10000) >>> 10));
                     length += 1;
                     chars[length] = (char) (0xDC00 | (c & 0x03FF));
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/Property.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/Property.java
index cec8f38d0..d846ff117 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/Property.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/Property.java
@@ -33,12 +33,12 @@ import java.util.Properties;
  */
 public class Property {
     /**
-     * Converts a property file object into a JSONObject. The property file
-     * object is a table of name value pairs.
+     * Converts a property file object into a JSONObject. The property file object is a table of name value pairs.
+     *
+     * @param properties java.util.Properties
      *
-     * @param properties
-     *            java.util.Properties
      * @return JSONObject
+     *
      * @throws JSONException
      */
     public static JSONObject toJSONObject(final java.util.Properties properties) throws JSONException {
@@ -56,9 +56,10 @@ public class Property {
     /**
      * Converts the JSONObject into a property file object.
      *
-     * @param jo
-     *            JSONObject
+     * @param jo JSONObject
+     *
      * @return java.util.Properties
+     *
      * @throws JSONException
      */
     public static Properties toProperties(final JSONObject jo) throws JSONException {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/XML.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/XML.java
index 1b83b2d76..cd6ce153f 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/XML.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/XML.java
@@ -3,8 +3,7 @@ package com.intellectualcrafters.json;
 import java.util.Iterator;
 
 /**
- * This provides static methods to convert an XML text into a JSONObject,
- * and to covert a JSONObject into an XML text.
+ * This provides static methods to convert an XML text into a JSONObject, and to covert a JSONObject into an XML text.
  *
  * @author JSON.org
  * @version 2014-05-03
@@ -14,32 +13,32 @@ public class XML {
     /**
      * The Character '&'.
      */
-    public static final Character AMP   = '&';
+    public static final Character AMP = '&';
 
     /**
      * The Character '''.
      */
-    public static final Character APOS  = '\'';
+    public static final Character APOS = '\'';
 
     /**
      * The Character '!'.
      */
-    public static final Character BANG  = '!';
+    public static final Character BANG = '!';
 
     /**
      * The Character '='.
      */
-    public static final Character EQ    = '=';
+    public static final Character EQ = '=';
 
     /**
      * The Character '>'.
      */
-    public static final Character GT    = '>';
+    public static final Character GT = '>';
 
     /**
      * The Character '<'.
      */
-    public static final Character LT    = '<';
+    public static final Character LT = '<';
 
     /**
      * The Character '?'.
@@ -49,7 +48,7 @@ public class XML {
     /**
      * The Character '"'.
      */
-    public static final Character QUOT  = '"';
+    public static final Character QUOT = '"';
 
     /**
      * The Character '/'.
@@ -59,7 +58,7 @@ public class XML {
     /**
      * Replace special characters with XML escapes:
      * 

-     *
+     * 

      * 
      * & (ampersand) is replaced by &amp;
      * < (less than) is replaced by &lt;
@@ -67,8 +66,8 @@ public class XML {
      * " (double quote) is replaced by &quot;
      * 

      *
-     * @param string
-     *            The string to be escaped.
+     * @param string The string to be escaped.
+     *
      * @return The escaped string.
      */
     public static String escape(final String string) {
@@ -99,11 +98,10 @@ public class XML {
     }
 
     /**
-     * Throw an exception if the string contains whitespace.
-     * Whitespace is not allowed in tagNames and attributes.
+     * Throw an exception if the string contains whitespace. Whitespace is not allowed in tagNames and attributes.
+     *
+     * @param string A string.
      *
-     * @param string
-     *            A string.
      * @throws JSONException
      */
     public static void noSpace(final String string) throws JSONException {
@@ -122,13 +120,12 @@ public class XML {
     /**
      * Scan the content following the named tag, attaching it to the context.
      *
-     * @param x
-     *            The XMLTokener containing the source string.
-     * @param context
-     *            The JSONObject that will include the new material.
-     * @param name
-     *            The tag name.
+     * @param x       The XMLTokener containing the source string.
+     * @param context The JSONObject that will include the new material.
+     * @param name    The tag name.
+     *
      * @return true if the close tag is processed.
+     *
      * @throws JSONException
      */
     private static boolean parse(final XMLTokener x, final JSONObject context, final String name) throws JSONException {
@@ -161,8 +158,7 @@ public class XML {
                     return false;
                 }
                 x.back();
-            }
-            else if (c == '[') {
+            } else if (c == '[') {
                 token = x.nextToken();
                 if ("CDATA".equals(token)) {
                     if (x.next() == '[') {
@@ -180,25 +176,20 @@ public class XML {
                 token = x.nextMeta();
                 if (token == null) {
                     throw x.syntaxError("Missing '>' after ' 0);
+            } while (i > 0);
             return false;
-        }
-        else if (token == QUEST) {
+        } else if (token == QUEST) {
 
             // ");
             return false;
-        }
-        else if (token == SLASH) {
+        } else if (token == SLASH) {
 
             // Close tag 
 
-                }
-                else if (token == SLASH) {
+                } else if (token == SLASH) {
                     if (x.nextToken() != GT) {
                         throw x.syntaxError("Misshaped tag");
                     }
                     if (jsonobject.length() > 0) {
                         context.accumulate(tagName, jsonobject);
-                    }
-                    else {
+                    } else {
                         context.accumulate(tagName, "");
                     }
                     return false;
 
                     // Content, between <...> and 
 
-                }
-                else if (token == GT) {
-                    for (;;) {
+                } else if (token == GT) {
+                    for (; ; ) {
                         token = x.nextContent();
                         if (token == null) {
                             if (tagName != null) {
                                 throw x.syntaxError("Unclosed tag " + tagName);
                             }
                             return false;
-                        }
-                        else if (token instanceof String) {
+                        } else if (token instanceof String) {
                             string = (String) token;
                             if (string.length() > 0) {
                                 jsonobject.accumulate("content", XML.stringToValue(string));
@@ -282,24 +266,20 @@ public class XML {
 
                             // Nested element
 
-                        }
-                        else if (token == LT) {
+                        } else if (token == LT) {
                             if (parse(x, jsonobject, tagName)) {
                                 if (jsonobject.length() == 0) {
                                     context.accumulate(tagName, "");
-                                }
-                                else if ((jsonobject.length() == 1) && (jsonobject.opt("content") != null)) {
+                                } else if ((jsonobject.length() == 1) && (jsonobject.opt("content") != null)) {
                                     context.accumulate(tagName, jsonobject.opt("content"));
-                                }
-                                else {
+                                } else {
                                     context.accumulate(tagName, jsonobject);
                                 }
                                 return false;
                             }
                         }
                     }
-                }
-                else {
+                } else {
                     throw x.syntaxError("Misshaped tag");
                 }
             }
@@ -307,14 +287,12 @@ public class XML {
     }
 
     /**
-     * Try to convert a string into a number, boolean, or null. If the string
-     * can't be converted, return the string. This is much less ambitious than
-     * JSONObject.stringToValue, especially because it does not attempt to
-     * convert plus forms, octal forms, hex forms, or E forms lacking decimal
-     * points.
+     * Try to convert a string into a number, boolean, or null. If the string can't be converted, return the string.
+     * This is much less ambitious than JSONObject.stringToValue, especially because it does not attempt to convert plus
+     * forms, octal forms, hex forms, or E forms lacking decimal points.
+     *
+     * @param string A String.
      *
-     * @param string
-     *            A String.
      * @return A simple JSON value.
      */
     public static Object stringToValue(final String string) {
@@ -340,34 +318,30 @@ public class XML {
                     return value;
                 }
             }
-        }
-        catch (final Exception ignore) {
+        } catch (final Exception ignore) {
             try {
                 final Double value = new Double(string);
                 if (value.toString().equals(string)) {
                     return value;
                 }
-            }
-            catch (final Exception ignoreAlso) {
+            } catch (final Exception ignoreAlso) {
             }
         }
         return string;
     }
 
     /**
-     * Convert a well-formed (but not necessarily valid) XML string into a
-     * JSONObject. Some information may be lost in this transformation
-     * because JSON is a data format and XML is a document format. XML uses
-     * elements, attributes, and content text, while JSON uses unordered
-     * collections of name/value pairs and arrays of values. JSON does not
-     * does not like to distinguish between elements and attributes.
-     * Sequences of similar elements are represented as JSONArrays. Content
-     * text may be placed in a "content" member. Comments, prologs, DTDs, and
-     * <[ [ ]]> are ignored.
+     * Convert a well-formed (but not necessarily valid) XML string into a JSONObject. Some information may be lost in
+     * this transformation because JSON is a data format and XML is a document format. XML uses elements, attributes,
+     * and content text, while JSON uses unordered collections of name/value pairs and arrays of values. JSON does not
+     * does not like to distinguish between elements and attributes. Sequences of similar elements are represented as
+     * JSONArrays. Content text may be placed in a "content" member. Comments, prologs, DTDs, and <[ [
+     * ]]> are ignored.
+     *
+     * @param string The source string.
      *
-     * @param string
-     *            The source string.
      * @return A JSONObject containing the structured data from the XML string.
+     *
      * @throws JSONException
      */
     public static JSONObject toJSONObject(final String string) throws JSONException {
@@ -382,9 +356,10 @@ public class XML {
     /**
      * Convert a JSONObject into a well-formed, element-normal XML string.
      *
-     * @param object
-     *            A JSONObject.
+     * @param object A JSONObject.
+     *
      * @return A string.
+     *
      * @throws JSONException
      */
     public static String toString(final Object object) throws JSONException {
@@ -394,11 +369,11 @@ public class XML {
     /**
      * Convert a JSONObject into a well-formed, element-normal XML string.
      *
-     * @param object
-     *            A JSONObject.
-     * @param tagName
-     *            The optional name of the enclosing tag.
+     * @param object  A JSONObject.
+     * @param tagName The optional name of the enclosing tag.
+     *
      * @return A string.
+     *
      * @throws JSONException
      */
     public static String toString(Object object, final String tagName) throws JSONException {
@@ -445,15 +420,13 @@ public class XML {
                             }
                             sb.append(escape(ja.get(i).toString()));
                         }
-                    }
-                    else {
+                    } else {
                         sb.append(escape(value.toString()));
                     }
 
                     // Emit an array of similar keys
 
-                }
-                else if (value instanceof JSONArray) {
+                } else if (value instanceof JSONArray) {
                     ja = (JSONArray) value;
                     length = ja.length();
                     for (i = 0; i < length; i += 1) {
@@ -466,21 +439,18 @@ public class XML {
                             sb.append("');
-                        }
-                        else {
+                        } else {
                             sb.append(toString(value, key));
                         }
                     }
-                }
-                else if ("".equals(value)) {
+                } else if ("".equals(value)) {
                     sb.append('<');
                     sb.append(key);
                     sb.append("/>");
 
                     // Emit a new tag 
 
-                }
-                else {
+                } else {
                     sb.append(toString(value, key));
                 }
             }
@@ -498,8 +468,7 @@ public class XML {
             // a place
             // where XML is lacking, synthesize an  element.
 
-        }
-        else {
+        } else {
             if (object.getClass().isArray()) {
                 object = new JSONArray(object);
             }
@@ -510,8 +479,7 @@ public class XML {
                     sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName));
                 }
                 return sb.toString();
-            }
-            else {
+            } else {
                 string = (object == null) ? "null" : escape(object.toString());
                 return (tagName == null) ? "\"" + string + "\"" : (string.length() == 0) ? "<" + tagName + "/>" : "<" + tagName + ">" + string + "";
             }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/json/XMLTokener.java b/PlotSquared/src/main/java/com/intellectualcrafters/json/XMLTokener.java
index 1e4896e7e..ab1513a72 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/json/XMLTokener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/json/XMLTokener.java
@@ -1,8 +1,7 @@
 package com.intellectualcrafters.json;
 
 /**
- * The XMLTokener extends the JSONTokener to provide additional methods
- * for the parsing of XML texts.
+ * The XMLTokener extends the JSONTokener to provide additional methods for the parsing of XML texts.
  *
  * @author JSON.org
  * @version 2014-05-03
@@ -10,8 +9,7 @@ package com.intellectualcrafters.json;
 public class XMLTokener extends JSONTokener {
 
     /**
-     * The table of entity values. It initially contains Character values for
-     * amp, apos, gt, lt, quot.
+     * The table of entity values. It initially contains Character values for amp, apos, gt, lt, quot.
      */
     public static final java.util.HashMap entity;
 
@@ -27,8 +25,7 @@ public class XMLTokener extends JSONTokener {
     /**
      * Construct an XMLTokener from a string.
      *
-     * @param s
-     *            A source string.
+     * @param s A source string.
      */
     public XMLTokener(final String s) {
         super(s);
@@ -38,14 +35,14 @@ public class XMLTokener extends JSONTokener {
      * Get the text in the CDATA block.
      *
      * @return The string up to the ]]>.
-     * @throws JSONException
-     *             If the ]]> is not found.
+     *
+     * @throws JSONException If the ]]> is not found.
      */
     public String nextCDATA() throws JSONException {
         char c;
         int i;
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (; ; ) {
             c = next();
             if (end()) {
                 throw syntaxError("Unclosed CDATA");
@@ -60,12 +57,11 @@ public class XMLTokener extends JSONTokener {
     }
 
     /**
-     * Get the next XML outer token, trimming whitespace. There are two kinds
-     * of tokens: the '<' character which begins a markup tag, and the content
-     * text between markup tags.
+     * Get the next XML outer token, trimming whitespace. There are two kinds of tokens: the '<' character which begins
+     * a markup tag, and the content text between markup tags.
+     *
+     * @return A string, or a '<' Character, or null if there is no more source text.
      *
-     * @return A string, or a '<' Character, or null if there is no more
-     * source text.
      * @throws JSONException
      */
     public Object nextContent() throws JSONException {
@@ -73,8 +69,7 @@ public class XMLTokener extends JSONTokener {
         StringBuilder sb;
         do {
             c = next();
-        }
-        while (Character.isWhitespace(c));
+        } while (Character.isWhitespace(c));
         if (c == 0) {
             return null;
         }
@@ -82,15 +77,14 @@ public class XMLTokener extends JSONTokener {
             return XML.LT;
         }
         sb = new StringBuilder();
-        for (;;) {
+        for (; ; ) {
             if ((c == '<') || (c == 0)) {
                 back();
                 return sb.toString().trim();
             }
             if (c == '&') {
                 sb.append(nextEntity(c));
-            }
-            else {
+            } else {
                 sb.append(c);
             }
             c = next();
@@ -98,26 +92,24 @@ public class XMLTokener extends JSONTokener {
     }
 
     /**
-     * Return the next entity. These entities are translated to Characters:
-     * &  '  >  <  ".
+     * Return the next entity. These entities are translated to Characters: &  '  >  <
+     * ".
+     *
+     * @param ampersand An ampersand character.
      *
-     * @param ampersand
-     *            An ampersand character.
      * @return A Character or an entity String if the entity is not recognized.
-     * @throws JSONException
-     *             If missing ';' in XML entity.
+     *
+     * @throws JSONException If missing ';' in XML entity.
      */
     public Object nextEntity(final char ampersand) throws JSONException {
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (; ; ) {
             final char c = next();
             if (Character.isLetterOrDigit(c) || (c == '#')) {
                 sb.append(Character.toLowerCase(c));
-            }
-            else if (c == ';') {
+            } else if (c == ';') {
                 break;
-            }
-            else {
+            } else {
                 throw syntaxError("Missing ';' in XML entity: &" + sb);
             }
         }
@@ -127,24 +119,19 @@ public class XMLTokener extends JSONTokener {
     }
 
     /**
-     * Returns the next XML meta token. This is used for skipping over 
-     * and  structures.
+     * Returns the next XML meta token. This is used for skipping over  and  structures.
      *
-     * @return Syntax characters (< > / = ! ?) are returned as
-     *         Character, and strings and names are returned as Boolean. We
-     *         don't care
-     *         what the values actually are.
-     * @throws JSONException
-     *             If a string is not properly closed or if the XML
-     *             is badly structured.
+     * @return Syntax characters (< > / = ! ?) are returned as Character, and strings and names are
+     * returned as Boolean. We don't care what the values actually are.
+     *
+     * @throws JSONException If a string is not properly closed or if the XML is badly structured.
      */
     public Object nextMeta() throws JSONException {
         char c;
         char q;
         do {
             c = next();
-        }
-        while (Character.isWhitespace(c));
+        } while (Character.isWhitespace(c));
         switch (c) {
             case 0:
                 throw syntaxError("Misshaped meta tag");
@@ -163,7 +150,7 @@ public class XMLTokener extends JSONTokener {
             case '"':
             case '\'':
                 q = c;
-                for (;;) {
+                for (; ; ) {
                     c = next();
                     if (c == 0) {
                         throw syntaxError("Unterminated string");
@@ -173,7 +160,7 @@ public class XMLTokener extends JSONTokener {
                     }
                 }
             default:
-                for (;;) {
+                for (; ; ) {
                     c = next();
                     if (Character.isWhitespace(c)) {
                         return Boolean.TRUE;
@@ -196,14 +183,12 @@ public class XMLTokener extends JSONTokener {
     }
 
     /**
-     * Get the next XML Token. These tokens are found inside of angle
-     * brackets. It may be one of these characters: / > = ! ? or it
-     * may be a string wrapped in single quotes or double quotes, or it may be a
-     * name.
+     * Get the next XML Token. These tokens are found inside of angle brackets. It may be one of these characters:
+     * / > = ! ? or it may be a string wrapped in single quotes or double quotes, or it may be a name.
      *
      * @return a String or a Character.
-     * @throws JSONException
-     *             If the XML is not well formed.
+     *
+     * @throws JSONException If the XML is not well formed.
      */
     public Object nextToken() throws JSONException {
         char c;
@@ -211,8 +196,7 @@ public class XMLTokener extends JSONTokener {
         StringBuilder sb;
         do {
             c = next();
-        }
-        while (Character.isWhitespace(c));
+        } while (Character.isWhitespace(c));
         switch (c) {
             case 0:
                 throw syntaxError("Misshaped element");
@@ -229,13 +213,13 @@ public class XMLTokener extends JSONTokener {
             case '?':
                 return XML.QUEST;
 
-                // Quoted string
+            // Quoted string
 
             case '"':
             case '\'':
                 q = c;
                 sb = new StringBuilder();
-                for (;;) {
+                for (; ; ) {
                     c = next();
                     if (c == 0) {
                         throw syntaxError("Unterminated string");
@@ -245,8 +229,7 @@ public class XMLTokener extends JSONTokener {
                     }
                     if (c == '&') {
                         sb.append(nextEntity(c));
-                    }
-                    else {
+                    } else {
                         sb.append(c);
                     }
                 }
@@ -255,7 +238,7 @@ public class XMLTokener extends JSONTokener {
                 // Name
 
                 sb = new StringBuilder();
-                for (;;) {
+                for (; ; ) {
                     sb.append(c);
                     c = next();
                     if (Character.isWhitespace(c)) {
@@ -283,12 +266,11 @@ public class XMLTokener extends JSONTokener {
     }
 
     /**
-     * Skip characters until past the requested string.
-     * If it is not found, we are left at the end of the source with a result of
-     * false.
+     * Skip characters until past the requested string. If it is not found, we are left at the end of the source with a
+     * result of false.
+     *
+     * @param to A string to skip past.
      *
-     * @param to
-     *            A string to skip past.
      * @throws JSONException
      */
     public boolean skipPast(final String to) throws JSONException {
@@ -315,7 +297,7 @@ public class XMLTokener extends JSONTokener {
 
         /* We will loop, possibly for all of the remaining characters. */
 
-        for (;;) {
+        for (; ; ) {
             j = offset;
             b = true;
 
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
index 819380ead..f6f7ba38d 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
@@ -21,38 +21,31 @@
 
 package com.intellectualcrafters.plot;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
+import com.intellectualcrafters.plot.commands.Auto;
+import com.intellectualcrafters.plot.commands.MainCommand;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.ConfigurationNode;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.database.*;
+import com.intellectualcrafters.plot.events.PlayerTeleportToPlotEvent;
+import com.intellectualcrafters.plot.events.PlotDeleteEvent;
+import com.intellectualcrafters.plot.flag.AbstractFlag;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.generator.DefaultPlotManager;
+import com.intellectualcrafters.plot.generator.DefaultPlotWorld;
+import com.intellectualcrafters.plot.generator.WorldGenerator;
+import com.intellectualcrafters.plot.listeners.*;
+import com.intellectualcrafters.plot.object.*;
+import com.intellectualcrafters.plot.util.*;
+import com.intellectualcrafters.plot.util.Logger.LogLevel;
+import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper;
+import com.intellectualcrafters.plot.uuid.PlotUUIDSaver;
+import com.intellectualcrafters.plot.uuid.UUIDSaver;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import me.confuser.barapi.BarAPI;
 import net.milkbowl.vault.economy.Economy;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Entity;
@@ -61,51 +54,16 @@ import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.intellectualcrafters.plot.commands.Auto;
-import com.intellectualcrafters.plot.commands.MainCommand;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.ConfigurationNode;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.database.MySQL;
-import com.intellectualcrafters.plot.database.PlotMeConverter;
-import com.intellectualcrafters.plot.database.SQLManager;
-import com.intellectualcrafters.plot.database.SQLite;
-import com.intellectualcrafters.plot.events.PlayerTeleportToPlotEvent;
-import com.intellectualcrafters.plot.events.PlotDeleteEvent;
-import com.intellectualcrafters.plot.flag.AbstractFlag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.generator.DefaultPlotManager;
-import com.intellectualcrafters.plot.generator.DefaultPlotWorld;
-import com.intellectualcrafters.plot.generator.WorldGenerator;
-import com.intellectualcrafters.plot.listeners.EntityListener;
-import com.intellectualcrafters.plot.listeners.ForceFieldListener;
-import com.intellectualcrafters.plot.listeners.InventoryListener;
-import com.intellectualcrafters.plot.listeners.PlayerEvents;
-import com.intellectualcrafters.plot.listeners.PlotListener;
-import com.intellectualcrafters.plot.listeners.PlotPlusListener;
-import com.intellectualcrafters.plot.listeners.WorldEditListener;
-import com.intellectualcrafters.plot.listeners.WorldGuardListener;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotGenerator;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.ConsoleColors;
-import com.intellectualcrafters.plot.util.Lag;
-import com.intellectualcrafters.plot.util.Logger;
-import com.intellectualcrafters.plot.util.Logger.LogLevel;
-import com.intellectualcrafters.plot.util.Metrics;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.intellectualcrafters.plot.util.SendChunk;
-import com.intellectualcrafters.plot.util.SetBlockFast;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper;
-import com.intellectualcrafters.plot.uuid.PlotUUIDSaver;
-import com.intellectualcrafters.plot.uuid.UUIDSaver;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
 
 /**
  * PlotMain class.
@@ -113,21 +71,20 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
  * @author Citymonstret
  * @author Empire92
  */
-@SuppressWarnings("unused")
-public class PlotMain extends JavaPlugin {
-    private static PlotMain                                     main               = null;
+@SuppressWarnings("unused") public class PlotMain extends JavaPlugin {
+    private static PlotMain main = null;
     /**
      * Permission that allows for "everything"
      */
-    public static final String                                  ADMIN_PERMISSION   = "plots.admin";
+    public static final String ADMIN_PERMISSION = "plots.admin";
     /**
      * Storage version
      */
-    public final static int                                     storage_ver        = 1;
+    public final static int storage_ver = 1;
     /**
      * Boolean Flags (material)
      */
-    public final static HashMap               booleanFlags       = new HashMap<>();
+    public final static HashMap booleanFlags = new HashMap<>();
 
     /**
      * Initialize the material flags
@@ -150,66 +107,65 @@ public class PlotMain extends JavaPlugin {
     /**
      * All loaded plot worlds
      */
-    private final static HashMap             worlds             = new HashMap<>();
+    private final static HashMap worlds = new HashMap<>();
     /**
      * All world managers
      */
-    private final static HashMap           managers           = new HashMap<>();
+    private final static HashMap managers = new HashMap<>();
     /**
      * settings.properties
      */
-    public static File                                          configFile;
+    public static File configFile;
     /**
      * The main configuration file
      */
-    public static YamlConfiguration                             config;
+    public static YamlConfiguration config;
     /**
      * storage.properties
      */
-    public static File                                          storageFile;
+    public static File storageFile;
     /**
      * Contains storage options
      */
-    public static YamlConfiguration                             storage;
+    public static YamlConfiguration storage;
     /**
      * MySQL Connection
      */
-    public static Connection                                    connection;
+    public static Connection connection;
     /**
      * WorldEdit object
      */
-    public static WorldEditPlugin                               worldEdit          = null;
+    public static WorldEditPlugin worldEdit = null;
     /**
      * BarAPI object
      */
-    public static BarAPI                                        barAPI             = null;
+    public static BarAPI barAPI = null;
     /**
      * World Guard Object
      */
-    public static WorldGuardPlugin                              worldGuard         = null;
+    public static WorldGuardPlugin worldGuard = null;
     /**
      * World Guard Listener
      */
-    public static WorldGuardListener                            worldGuardListener = null;
+    public static WorldGuardListener worldGuardListener = null;
     /**
      * Economy Object (vault)
      */
-    public static Economy                                       economy;
+    public static Economy economy;
     /**
      * Use Economy?
      */
-    public static boolean                                       useEconomy         = false;
+    public static boolean useEconomy = false;
     /**
      * The UUID Saver
      */
-    private static UUIDSaver                                    uuidSaver;
+    private static UUIDSaver uuidSaver;
     /**
      * MySQL Object
      */
-    private static MySQL                                        mySQL;
+    private static MySQL mySQL;
     /**
-     * List of all plots
-     * DO NOT USE EXCEPT FOR DATABASE PURPOSES
+     * List of all plots DO NOT USE EXCEPT FOR DATABASE PURPOSES
      */
     private static LinkedHashMap> plots;
 
@@ -230,8 +186,7 @@ public class PlotMain extends JavaPlugin {
             public void run() {
                 try {
                     checkExpired(plugin, true);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     e.printStackTrace();
                 }
             }
@@ -239,15 +194,12 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * Check a range of permissions e.g. 'plots.plot.<0-100>'

-     * Returns highest integer in range.
+     * Check a range of permissions e.g. 'plots.plot.<0-100>'
 Returns highest integer in range.
+     *
+     * @param player to check
+     * @param stub   to check
+     * @param range  tp check
      *
-     * @param player
-     *            to check
-     * @param stub
-     *            to check
-     * @param range
-     *            tp check
      * @return permitted range
      */
     public static int hasPermissionRange(final Player player, final String stub, final int range) {
@@ -266,14 +218,11 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * Check a player for a permission

-     * - Op has all permissions 

-     * - checks for '*' nodes
+     * Check a player for a permission
 - Op has all permissions 
 - checks for '*' nodes
+     *
+     * @param player to check
+     * @param perms  to check
      *
-     * @param player
-     *            to check
-     * @param perms
-     *            to check
      * @return true of player has permissions
      */
     public static boolean hasPermissions(final Player player, final String[] perms) {
@@ -285,8 +234,7 @@ public class PlotMain extends JavaPlugin {
             boolean permitted = false;
             if (player.hasPermission(perm)) {
                 permitted = true;
-            }
-            else {
+            } else {
                 final String[] nodes = perm.split("\\.");
                 final StringBuilder n = new StringBuilder();
                 for (int i = 0; i < (nodes.length - 1); i++) {
@@ -309,6 +257,7 @@ public class PlotMain extends JavaPlugin {
      * Get the uuid saver
      *
      * @return uuid saver
+     *
      * @see com.intellectualcrafters.plot.uuid.UUIDSaver;
      */
     public static UUIDSaver getUUIDSaver() {
@@ -318,8 +267,8 @@ public class PlotMain extends JavaPlugin {
     /**
      * Set the uuid saver
      *
-     * @param saver
-     *            new saver
+     * @param saver new saver
+     *
      * @see com.intellectualcrafters.plot.uuid.UUIDSaver
      */
     public static void setUUIDSaver(final UUIDSaver saver) {
@@ -327,14 +276,11 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * Check a player for a permission

-     * - Op has all permissions 

-     * - checks for '*' nodes
+     * Check a player for a permission
 - Op has all permissions 
 - checks for '*' nodes
+     *
+     * @param player to check
+     * @param perm   to check
      *
-     * @param player
-     *            to check
-     * @param perm
-     *            to check
      * @return true if player has the permission
      */
     public static boolean hasPermission(final Player player, final String perm) {
@@ -383,8 +329,8 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param player
-     *            player
+     * @param player player
+     *
      * @return Set Containing the players plots
      */
     public static Set getPlots(final Player player) {
@@ -403,10 +349,9 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param world
-     *            plot world
-     * @param player
-     *            plot owner
+     * @param world  plot world
+     * @param player plot owner
+     *
      * @return players plots
      */
     public static Set getPlots(final World world, final Player player) {
@@ -425,8 +370,8 @@ public class PlotMain extends JavaPlugin {
     /**
      * Get plots for the specified world
      *
-     * @param world
-     *            A world, in which you want to search for plots
+     * @param world A world, in which you want to search for plots
+     *
      * @return HashMap containing Plot IDs and Plot Objects
      */
     public static HashMap getPlots(final String world) {
@@ -437,8 +382,8 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param world
-     *            plot world
+     * @param world plot world
+     *
      * @return plots in world
      */
     public static HashMap getPlots(final World world) {
@@ -465,8 +410,8 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param world
-     *            plotworld(?)
+     * @param world plotworld(?)
+     *
      * @return true if the world is a plotworld
      */
     public static boolean isPlotWorld(final World world) {
@@ -474,8 +419,8 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param world
-     *            plotworld(?)
+     * @param world plotworld(?)
+     *
      * @return true if the world is a plotworld
      */
     public static boolean isPlotWorld(final String world) {
@@ -483,8 +428,8 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param world
-     *            World to get manager for
+     * @param world World to get manager for
+     *
      * @return manager for world
      */
     public static PlotManager getPlotManager(final World world) {
@@ -495,8 +440,8 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param world
-     *            world
+     * @param world world
+     *
      * @return PlotManager
      */
     public static PlotManager getPlotManager(final String world) {
@@ -507,8 +452,8 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param world
-     *            to search
+     * @param world to search
+     *
      * @return PlotWorld object
      */
     public static PlotWorld getWorldSettings(final World world) {
@@ -519,8 +464,8 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param world
-     *            to search
+     * @param world to search
+     *
      * @return PlotWorld object
      */
     public static PlotWorld getWorldSettings(final String world) {
@@ -531,8 +476,8 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * @param world
-     *            world to search
+     * @param world world to search
+     *
      * @return set containing the plots for a world
      */
     public static Plot[] getWorldPlots(final World world) {
@@ -543,12 +488,10 @@ public class PlotMain extends JavaPlugin {
     /**
      * Remove a plot
      *
-     * @param world
-     *            The Plot World
-     * @param id
-     *            The Plot ID
-     * @param callEvent
-     *            Whether or not to call the PlotDeleteEvent
+     * @param world     The Plot World
+     * @param id        The Plot ID
+     * @param callEvent Whether or not to call the PlotDeleteEvent
+     *
      * @return true if successful, false if not
      */
     public static boolean removePlot(final String world, final PlotId id, final boolean callEvent) {
@@ -567,8 +510,7 @@ public class PlotMain extends JavaPlugin {
     /**
      * Replace the plot object with an updated version
      *
-     * @param plot
-     *            plot object
+     * @param plot plot object
      */
     public static void updatePlot(final Plot plot) {
         final String world = plot.world;
@@ -580,30 +522,16 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * TODO: Implement better system The whole point of this system is to
-     * recycle old plots 

-     * So why not just allow users to claim old plots, and try to hide the fact
-     * that the are owned. 

-     * 

-     * Reduce amount of expired plots: 

-     * - On /plot 

-     * auto

-     * - allow claiming of old plot, clear it so the user doesn't know

-     * - On /plot info,

-     * - show that the plot is expired and allowed to be claimed Have the task
-     * run less often:

-     * - Run the task when there are very little, or no players online (great
-     * for small servers)

-     * - Run the task at startup (also only useful for small servers)

-     * Also, in terms of faster code:

-     * - Have an array of plots, sorted by expiry time.

-     * - Add new plots to the end.

-     * - The task then only needs to go through the first few plots
+     * TODO: Implement better system The whole point of this system is to recycle old plots 
 So why not just
+     * allow users to claim old plots, and try to hide the fact that the are owned. 
 
 Reduce amount of expired
+     * plots: 
 - On /plot 
 auto
 - allow claiming of old plot, clear it so the user doesn't know
 - On
+     * /plot info,
 - show that the plot is expired and allowed to be claimed Have the task run less often:
 - Run
+     * the task when there are very little, or no players online (great for small servers)
 - Run the task at startup
+     * (also only useful for small servers)
 Also, in terms of faster code:
 - Have an array of plots, sorted by
+     * expiry time.
 - Add new plots to the end.
 - The task then only needs to go through the first few plots
      *
-     * @param plugin
-     *            Plugin
-     * @param async
-     *            Call async?
+     * @param plugin Plugin
+     * @param async  Call async?
      */
     private static void checkExpired(final JavaPlugin plugin, final boolean async) {
         if (async) {
@@ -629,8 +557,7 @@ public class PlotMain extends JavaPlugin {
                                     Bukkit.getServer().getPluginManager().callEvent(event);
                                     if (event.isCancelled()) {
                                         event.setCancelled(true);
-                                    }
-                                    else {
+                                    } else {
                                         toDeletePlot.add(plot);
                                     }
                                 }
@@ -649,8 +576,7 @@ public class PlotMain extends JavaPlugin {
                     }
                 }
             });
-        }
-        else {
+        } else {
             for (final String world : getPlotWorldsString()) {
                 if (PlotMain.plots.containsKey(world)) {
                     for (final Plot plot : PlotMain.plots.get(world).values()) {
@@ -659,8 +585,7 @@ public class PlotMain extends JavaPlugin {
                             Bukkit.getServer().getPluginManager().callEvent(event);
                             if (event.isCancelled()) {
                                 event.setCancelled(true);
-                            }
-                            else {
+                            } else {
                                 DBFunc.delete(world, plot);
                             }
                         }
@@ -691,14 +616,12 @@ public class PlotMain extends JavaPlugin {
     /**
      * Send a message to the console.
      *
-     * @param string
-     *            message
+     * @param string message
      */
     public static void sendConsoleSenderMessage(final String string) {
         if (getMain().getServer().getConsoleSender() == null) {
             System.out.println(ChatColor.stripColor(ConsoleColors.fromString(string)));
-        }
-        else {
+        } else {
             getMain().getServer().getConsoleSender().sendMessage(ChatColor.translateAlternateColorCodes('&', string));
         }
     }
@@ -706,12 +629,10 @@ public class PlotMain extends JavaPlugin {
     /**
      * Teleport a player to a plot
      *
-     * @param player
-     *            Player to teleport
-     * @param from
-     *            Previous Location
-     * @param plot
-     *            Plot to teleport to
+     * @param player Player to teleport
+     * @param from   Previous Location
+     * @param plot   Plot to teleport to
+     *
      * @return true if successful
      */
     public static boolean teleportPlayer(final Player player, final Location from, final Plot plot) {
@@ -732,8 +653,7 @@ public class PlotMain extends JavaPlugin {
     /**
      * Send a message to the console
      *
-     * @param c
-     *            message
+     * @param c message
      */
     @SuppressWarnings("unused")
     public static void sendConsoleSenderMessage(final C c) {
@@ -743,8 +663,7 @@ public class PlotMain extends JavaPlugin {
     /**
      * Broadcast publicly
      *
-     * @param c
-     *            message
+     * @param c message
      */
     public static void Broadcast(final C c) {
         Bukkit.broadcastMessage(ChatColor.translateAlternateColorCodes('&', C.PREFIX.s() + c.s()));
@@ -762,8 +681,7 @@ public class PlotMain extends JavaPlugin {
     /**
      * Broadcast a message to all admins
      *
-     * @param c
-     *            message
+     * @param c message
      */
     public static void BroadcastWithPerms(final C c) {
         for (final Player player : Bukkit.getOnlinePlayers()) {
@@ -786,8 +704,8 @@ public class PlotMain extends JavaPlugin {
     /**
      * Ge the last played time
      *
-     * @param uuid
-     *            UUID for the player
+     * @param uuid UUID for the player
+     *
      * @return last play time as a long
      */
     public static long getLastPlayed(final UUID uuid) {
@@ -819,8 +737,7 @@ public class PlotMain extends JavaPlugin {
             }
             config = YamlConfiguration.loadConfiguration(configFile);
             setupConfig();
-        }
-        catch (final Exception err_trans) {
+        } catch (final Exception err_trans) {
             Logger.add(LogLevel.DANGER, "Failed to save settings.yml");
             System.out.println("Failed to save settings.yml");
         }
@@ -833,16 +750,14 @@ public class PlotMain extends JavaPlugin {
             }
             storage = YamlConfiguration.loadConfiguration(storageFile);
             setupStorage();
-        }
-        catch (final Exception err_trans) {
+        } catch (final Exception err_trans) {
             Logger.add(LogLevel.DANGER, "Failed to save storage.yml");
             System.out.println("Failed to save storage.yml");
         }
         try {
             config.save(configFile);
             storage.save(storageFile);
-        }
-        catch (final IOException e) {
+        } catch (final IOException e) {
             Logger.add(LogLevel.DANGER, "Configuration file saving failed");
             e.printStackTrace();
         }
@@ -888,7 +803,7 @@ public class PlotMain extends JavaPlugin {
     public static void killAllEntities() {
         Bukkit.getScheduler().scheduleSyncRepeatingTask(getMain(), new Runnable() {
             long ticked = 0l;
-            long error  = 0l;
+            long error = 0l;
 
             {
                 sendConsoleSenderMessage(C.PREFIX.s() + "KillAllEntities started.");
@@ -977,11 +892,9 @@ public class PlotMain extends JavaPlugin {
                                 // }
                             }
                         }
-                    }
-                    catch (final Throwable e) {
+                    } catch (final Throwable e) {
                         ++this.error;
-                    }
-                    finally {
+                    } finally {
                         ++this.ticked;
                     }
                 }
@@ -1049,8 +962,7 @@ public class PlotMain extends JavaPlugin {
     /**
      * Create a plotworld config section
      *
-     * @param plotworld
-     *            World to create the section for
+     * @param plotworld World to create the section for
      */
     @SuppressWarnings("unused")
     public static void createConfiguration(final PlotWorld plotworld) {
@@ -1068,8 +980,7 @@ public class PlotMain extends JavaPlugin {
 
         try {
             config.save(PlotMain.configFile);
-        }
-        catch (final IOException e) {
+        } catch (final IOException e) {
             PlotMain.sendConsoleSenderMessage("&c[Warning] PlotSquared failed to save the configuration&7 (settings.yml may differ from the one in memory)\n - To force a save from console use /plots save");
         }
     }
@@ -1105,15 +1016,13 @@ public class PlotMain extends JavaPlugin {
 
             try {
                 config.save(configFile);
-            }
-            catch (final IOException e) {
+            } catch (final IOException e) {
                 e.printStackTrace();
             }
 
             // Now add it
             addPlotWorld(world, plotWorld, plotManager);
-        }
-        else {
+        } else {
             if (worlds.contains(world)) {
                 sendConsoleSenderMessage("&cWorld '" + world + "' in settings.yml is not using PlotSquared generator!");
 
@@ -1129,8 +1038,7 @@ public class PlotMain extends JavaPlugin {
 
                 try {
                     config.save(configFile);
-                }
-                catch (final IOException e) {
+                } catch (final IOException e) {
                     e.printStackTrace();
                 }
 
@@ -1141,13 +1049,11 @@ public class PlotMain extends JavaPlugin {
     }
 
     /**
-     * Adds an external world as a recognized PlotSquared world - The PlotWorld
-     * class created is based off the configuration in the settings.yml - Do not
-     * use this method unless the required world is preconfigured in the
+     * Adds an external world as a recognized PlotSquared world - The PlotWorld class created is based off the
+     * configuration in the settings.yml - Do not use this method unless the required world is preconfigured in the
      * settings.yml
      *
-     * @param world
-     *            to load
+     * @param world to load
      */
     public static void loadWorld(final World world) {
         if (world == null) {
@@ -1207,17 +1113,14 @@ public class PlotMain extends JavaPlugin {
                         seconds = 1;
                         try {
                             amount = Integer.parseInt(values[0]);
-                        }
-                        catch (final Exception e) {
+                        } catch (final Exception e) {
                             return null;
                         }
-                    }
-                    else {
+                    } else {
                         try {
                             amount = Integer.parseInt(values[0]);
                             seconds = Integer.parseInt(values[1]);
-                        }
-                        catch (final Exception e) {
+                        } catch (final Exception e) {
                             return null;
                         }
                     }
@@ -1344,8 +1247,7 @@ public class PlotMain extends JavaPlugin {
             public String parseValue(final String value) {
                 try {
                     return Long.parseLong(value) + "";
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     return null;
                 }
             }
@@ -1383,12 +1285,9 @@ public class PlotMain extends JavaPlugin {
     /**
      * Add a Plot world
      *
-     * @param world
-     *            World to add
-     * @param plotworld
-     *            PlotWorld Object
-     * @param manager
-     *            Plot Manager for the new world
+     * @param world     World to add
+     * @param plotworld PlotWorld Object
+     * @param manager   Plot Manager for the new world
      */
     public static void addPlotWorld(final String world, final PlotWorld plotworld, final PlotManager manager) {
         worlds.put(world, plotworld);
@@ -1401,8 +1300,7 @@ public class PlotMain extends JavaPlugin {
     /**
      * Remove a plot world
      *
-     * @param world
-     *            World to remove
+     * @param world World to remove
      */
     public static void removePlotWorld(final String world) {
         plots.remove(world);
@@ -1422,8 +1320,7 @@ public class PlotMain extends JavaPlugin {
     /**
      * Set all plots
      *
-     * @param plots
-     *            New Plot LinkedHashMap
+     * @param plots New Plot LinkedHashMap
      */
     public static void setAllPlotsRaw(final LinkedHashMap> plots) {
         PlotMain.plots = plots;
@@ -1432,8 +1329,7 @@ public class PlotMain extends JavaPlugin {
     /**
      * Set all plots
      *
-     * @param plots
-     *            New Plot HashMap
+     * @param plots New Plot HashMap
      */
     public static void setAllPlotsRaw(final HashMap> plots) {
         PlotMain.plots = new LinkedHashMap<>(plots);
@@ -1465,8 +1361,7 @@ public class PlotMain extends JavaPlugin {
                     writer.write("Created at: " + new Date().toString() + "\n\n\n");
                     writer.close();
                 }
-            }
-            catch (final IOException e) {
+            } catch (final IOException e) {
 
                 e.printStackTrace();
             }
@@ -1493,8 +1388,7 @@ public class PlotMain extends JavaPlugin {
             sendConsoleSenderMessage(C.PREFIX.s() + "&cURL: &6https://java.com/en/download/index.jsp");
             Bukkit.getPluginManager().disablePlugin(this);
             return;
-        }
-        else if (getJavaVersion() < 1.8) {
+        } else if (getJavaVersion() < 1.8) {
             sendConsoleSenderMessage(C.PREFIX.s() + "&cIt's really recommended to run Java 1.8, as it increases performance");
         }
         // Setup configuration
@@ -1505,12 +1399,10 @@ public class PlotMain extends JavaPlugin {
                 final Metrics metrics = new Metrics(this);
                 metrics.start();
                 sendConsoleSenderMessage(C.PREFIX.s() + "&6Metrics enabled.");
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 sendConsoleSenderMessage(C.PREFIX.s() + "&cFailed to load up metrics.");
             }
-        }
-        else {
+        } else {
             // We should at least make them feel bad.
             sendConsoleSenderMessage("Using metrics will allow us to improve the plugin\nPlease consider it :)");
         }
@@ -1523,7 +1415,7 @@ public class PlotMain extends JavaPlugin {
         }
 
         // Add tables to this one, if we create more :D
-        final String[] tables = new String[] { "plot_trusted", "plot_ratings", "plot_comments" };
+        final String[] tables = new String[]{"plot_trusted", "plot_ratings", "plot_comments"};
 
         // Use mysql?
         if (Settings.DB.USE_MYSQL) {
@@ -1538,8 +1430,7 @@ public class PlotMain extends JavaPlugin {
                     ResultSet res = meta.getTables(null, null, Settings.DB.PREFIX + "plot", null);
                     if (!res.next()) {
                         DBFunc.createTables("mysql", true);
-                    }
-                    else {
+                    } else {
                         for (final String table : tables) {
                             res = meta.getTables(null, null, Settings.DB.PREFIX + table, null);
                             if (!res.next()) {
@@ -1549,8 +1440,7 @@ public class PlotMain extends JavaPlugin {
                         // We should not repeat our self :P
                     }
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 Logger.add(LogLevel.DANGER, "MySQL connection failed.");
                 sendConsoleSenderMessage("&c[Plots] MySQL is not setup correctly. The plugin will disable itself.");
                 if ((config == null) || config.getBoolean("debug")) {
@@ -1568,8 +1458,7 @@ public class PlotMain extends JavaPlugin {
         else if (Settings.DB.USE_MONGO) {
             // DBFunc.dbManager = new MongoManager();
             sendConsoleSenderMessage(C.PREFIX.s() + "MongoDB is not yet implemented");
-        }
-        else if (Settings.DB.USE_SQLITE) {
+        } else if (Settings.DB.USE_SQLITE) {
             try {
                 connection = new SQLite(this, Settings.DB.SQLITE_DB + ".db").openConnection();
                 {
@@ -1578,8 +1467,7 @@ public class PlotMain extends JavaPlugin {
                     ResultSet res = meta.getTables(null, null, Settings.DB.PREFIX + "plot", null);
                     if (!res.next()) {
                         DBFunc.createTables("sqlite", true);
-                    }
-                    else {
+                    } else {
                         for (final String table : tables) {
                             res = meta.getTables(null, null, Settings.DB.PREFIX + table, null);
                             if (!res.next()) {
@@ -1588,8 +1476,7 @@ public class PlotMain extends JavaPlugin {
                         }
                     }
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 Logger.add(LogLevel.DANGER, "SQLite connection failed");
                 sendConsoleSenderMessage(C.PREFIX.s() + "&cFailed to open SQLite connection. The plugin will disable itself.");
                 sendConsoleSenderMessage("&9==== Here is an ugly stacktrace, if you are interested in those things ===");
@@ -1598,8 +1485,7 @@ public class PlotMain extends JavaPlugin {
                 return;
             }
             plots = DBFunc.getPlots();
-        }
-        else {
+        } else {
             Logger.add(LogLevel.DANGER, "No storage type is set.");
             sendConsoleSenderMessage(C.PREFIX + "&cNo storage type is set!");
             getServer().getPluginManager().disablePlugin(this);
@@ -1612,8 +1498,7 @@ public class PlotMain extends JavaPlugin {
         if (getServer().getPluginManager().getPlugin("PlotMe") != null) {
             try {
                 new PlotMeConverter(this).runAsync();
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 e.printStackTrace();
             }
         }
@@ -1653,8 +1538,7 @@ public class PlotMain extends JavaPlugin {
                 PlotMain.sendConsoleSenderMessage("&cThis version of WorldEdit does not support PlotSquared.");
                 PlotMain.sendConsoleSenderMessage("&cPlease use WorldEdit 6+");
                 PlotMain.sendConsoleSenderMessage("&c - http://builds.enginehub.org/job/worldedit");
-            }
-            else {
+            } else {
                 getServer().getPluginManager().registerEvents(new WorldEditListener(), this);
             }
         }
@@ -1688,16 +1572,14 @@ public class PlotMain extends JavaPlugin {
             try {
                 new SetBlockFast();
                 PlotHelper.canSetFast = true;
-            }
-            catch (final Throwable e) {
+            } catch (final Throwable e) {
                 PlotHelper.canSetFast = false;
             }
 
             try {
                 new SendChunk();
                 PlotHelper.canSendChunk = true;
-            }
-            catch (final Throwable e) {
+            } catch (final Throwable e) {
                 PlotHelper.canSendChunk = false;
             }
         }
@@ -1727,8 +1609,7 @@ public class PlotMain extends JavaPlugin {
     final public void onDisable() {
         try {
             C.saveTranslations();
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             sendConsoleSenderMessage("Failed to save translations");
             Logger.add(LogLevel.DANGER, "Failed to save translations");
             e.printStackTrace();
@@ -1736,15 +1617,13 @@ public class PlotMain extends JavaPlugin {
         Logger.add(LogLevel.GENERAL, "Logger disabled");
         try {
             Logger.write();
-        }
-        catch (final IOException e1) {
+        } catch (final IOException e1) {
             e1.printStackTrace();
         }
         try {
             connection.close();
             mySQL.closeConnection();
-        }
-        catch (NullPointerException | SQLException e) {
+        } catch (NullPointerException | SQLException e) {
             if (connection != null) {
                 Logger.add(LogLevel.DANGER, "Could not close mysql connection");
             }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
index 22114e90f..ee2ded3ec 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
@@ -21,16 +21,6 @@
 
 package com.intellectualcrafters.plot.api;
 
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.commands.MainCommand;
 import com.intellectualcrafters.plot.commands.SubCommand;
@@ -41,31 +31,33 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.intellectualcrafters.plot.util.PlotSquaredException;
-import com.intellectualcrafters.plot.util.SchematicHandler;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.util.*;
 import com.sun.istack.internal.NotNull;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.ArrayList;
+import java.util.Set;
 
 /**
  * PlotSquared API
  *
  * @author Citymonstret
  * @author Empire92
- *
  * @version API 2.0
  */
 
-@SuppressWarnings("unused")
-public class PlotAPI {
+@SuppressWarnings("unused") public class PlotAPI {
 
     /**
-     * Permission that allows for admin access,
-     * this permission node will allow the player
-     * to use any part of the plugin, without limitations.
+     * Permission that allows for admin access, this permission node will allow the player to use any part of the
+     * plugin, without limitations.
      */
-    public static final String      ADMIN_PERMISSION = "plots.admin";
+    public static final String ADMIN_PERMISSION = "plots.admin";
 
     /**
      * Plot Helper Class
@@ -74,29 +66,29 @@ public class PlotAPI {
      *
      * @see com.intellectualcrafters.plot.util.PlotHelper
      */
-    private static PlotHelper       plotHelper;
+    private static PlotHelper plotHelper;
 
     /**
      * Player Functions
-     *
+     * 

      * General functions involving players, and plot worlds
      *
      * @see com.intellectualcrafters.plot.util.PlayerFunctions
      */
-    private static PlayerFunctions  playerFunctions;
+    private static PlayerFunctions playerFunctions;
 
     /**
      * Flag Manager
-     *
+     * 

      * The manager which handles all flags
      *
      * @see com.intellectualcrafters.plot.flag.FlagManager
      */
-    private static FlagManager      flagManager;
+    private static FlagManager flagManager;
 
     /**
      * Schematic Handler
-     *
+     * 

      * The handler which is used to create, and paste, schematics
      *
      * @see com.intellectualcrafters.plot.util.SchematicHandler
@@ -108,25 +100,24 @@ public class PlotAPI {
      *
      * @see com.intellectualcrafters.plot.config.C
      */
-    private static C                c;
+    private static C c;
 
     /**
      * PlotMain instance
-     *
+     * 

      * This is the instance that allows for most methods to be used.
      *
      * @see com.intellectualcrafters.plot.PlotMain
      */
-    private final PlotMain          plotMain;
+    private final PlotMain plotMain;
 
     /**
-     * Constructor. Insert any Plugin.
-     * (Optimally the plugin that is accessing the method)
+     * Constructor. Insert any Plugin. (Optimally the plugin that is accessing the method)
      *
-     * @param plugin
-     *            Plugin used to access this method
-     * @throws com.intellectualcrafters.plot.util.PlotSquaredException
-     *             if the program fails to fetch the PlotMain instance
+     * @param plugin Plugin used to access this method
+     *
+     * @throws com.intellectualcrafters.plot.util.PlotSquaredException if the program fails to fetch the PlotMain
+     *                                                                 instance
      * @see com.intellectualcrafters.plot.PlotMain
      */
     public PlotAPI(@NotNull final JavaPlugin plugin) {
@@ -140,6 +131,7 @@ public class PlotAPI {
      * Get all plots
      *
      * @return all plots
+     *
      * @see com.intellectualcrafters.plot.PlotMain#getPlots()
      */
     public Set getAllPlots() {
@@ -149,8 +141,8 @@ public class PlotAPI {
     /**
      * Return all plots for a player
      *
-     * @param player
-     *            Player, whose plots to search for
+     * @param player Player, whose plots to search for
+     *
      * @return all plots that a player owns
      */
     public Set getPlayerPlots(@NotNull final Player player) {
@@ -160,15 +152,12 @@ public class PlotAPI {
     /**
      * Add a plot world
      *
-     * @param world
-     *            World Name
-     * @param plotWorld
-     *            Plot World Object
-     * @param manager
-     *            World Manager
-     * @see com.intellectualcrafters.plot.PlotMain#addPlotWorld(String,
-     *      com.intellectualcrafters.plot.object.PlotWorld,
-     *      com.intellectualcrafters.plot.object.PlotManager)
+     * @param world     World Name
+     * @param plotWorld Plot World Object
+     * @param manager   World Manager
+     *
+     * @see com.intellectualcrafters.plot.PlotMain#addPlotWorld(String, com.intellectualcrafters.plot.object.PlotWorld,
+     * com.intellectualcrafters.plot.object.PlotManager)
      */
     public void addPlotWorld(@NotNull final String world, @NotNull final PlotWorld plotWorld, @NotNull final PlotManager manager) {
         PlotMain.addPlotWorld(world, plotWorld, manager);
@@ -176,6 +165,7 @@ public class PlotAPI {
 
     /**
      * @return main configuration
+     *
      * @see com.intellectualcrafters.plot.PlotMain#config
      */
     public YamlConfiguration getConfig() {
@@ -184,6 +174,7 @@ public class PlotAPI {
 
     /**
      * @return storage configuration
+     *
      * @see com.intellectualcrafters.plot.PlotMain#storage
      */
     public YamlConfiguration getStorage() {
@@ -191,11 +182,11 @@ public class PlotAPI {
     }
 
     /**
-     * Get the main class for this plugin 

-     * - Contains a lot of fields and methods - not very well organized 

+     * Get the main class for this plugin 
 - Contains a lot of fields and methods - not very well organized 

      * Only use this if you really need it
      *
      * @return PlotMain PlotSquared Main Class
+     *
      * @see com.intellectualcrafters.plot.PlotMain
      */
     public PlotMain getMain() {
@@ -206,6 +197,7 @@ public class PlotAPI {
      * PlotHelper class contains useful methods relating to plots.
      *
      * @return PlotHelper
+     *
      * @see com.intellectualcrafters.plot.util.PlotHelper
      */
     public PlotHelper getPlotHelper() {
@@ -213,10 +205,10 @@ public class PlotAPI {
     }
 
     /**
-     * PlayerFunctions class contains useful methods relating to players - Some
-     * player/plot methods are here as well
+     * PlayerFunctions class contains useful methods relating to players - Some player/plot methods are here as well
      *
      * @return PlayerFunctions
+     *
      * @see com.intellectualcrafters.plot.util.PlayerFunctions
      */
     public PlayerFunctions getPlayerFunctions() {
@@ -227,6 +219,7 @@ public class PlotAPI {
      * FlagManager class contains methods relating to plot flags
      *
      * @return FlagManager
+     *
      * @see com.intellectualcrafters.plot.flag.FlagManager
      */
     public FlagManager getFlagManager() {
@@ -237,6 +230,7 @@ public class PlotAPI {
      * SchematicHandler class contains methods related to pasting schematics
      *
      * @return SchematicHandler
+     *
      * @see com.intellectualcrafters.plot.util.SchematicHandler
      */
     public SchematicHandler getSchematicHandler() {
@@ -247,6 +241,7 @@ public class PlotAPI {
      * C class contains all the captions from the translations.yml file.
      *
      * @return C
+     *
      * @see com.intellectualcrafters.plot.config.C
      */
     public C getCaptions() {
@@ -254,12 +249,12 @@ public class PlotAPI {
     }
 
     /**
-     * Get the plot manager for a world. - Most of these methods can be accessed
-     * through the PlotHelper
+     * Get the plot manager for a world. - Most of these methods can be accessed through the PlotHelper
+     *
+     * @param world Which manager to get
      *
-     * @param world
-     *            Which manager to get
      * @return PlotManager
+     *
      * @see com.intellectualcrafters.plot.object.PlotManager
      * @see PlotMain#getPlotManager(org.bukkit.World)
      */
@@ -268,12 +263,13 @@ public class PlotAPI {
     }
 
     /**
-     * Get the plot manager for a world. - Contains useful low level methods for
-     * plot merging, clearing, and tessellation
+     * Get the plot manager for a world. - Contains useful low level methods for plot merging, clearing, and
+     * tessellation
+     *
+     * @param world Plot World
      *
-     * @param world
-     *            Plot World
      * @return PlotManager
+     *
      * @see PlotMain#getPlotManager(String)
      * @see com.intellectualcrafters.plot.object.PlotManager
      */
@@ -282,14 +278,13 @@ public class PlotAPI {
     }
 
     /**
-     * Get the settings for a world (settings bundled in PlotWorld class) - You
-     * will need to downcast for the specific settings a Generator has. e.g.
-     * DefaultPlotWorld class implements PlotWorld
+     * Get the settings for a world (settings bundled in PlotWorld class) - You will need to downcast for the specific
+     * settings a Generator has. e.g. DefaultPlotWorld class implements PlotWorld
+     *
+     * @param world (to get settings of)
+     *
+     * @return PlotWorld class for that world ! will return null if not a plot world world
      *
-     * @param world
-     *            (to get settings of)
-     * @return PlotWorld class for that world ! will return null if not a plot
-     *         world world
      * @see PlotMain#getWorldSettings(org.bukkit.World)
      * @see com.intellectualcrafters.plot.object.PlotWorld
      */
@@ -300,10 +295,10 @@ public class PlotAPI {
     /**
      * Get the settings for a world (settings bundled in PlotWorld class)
      *
-     * @param world
-     *            (to get settings of)
-     * @return PlotWorld class for that world ! will return null if not a plot
-     *         world world
+     * @param world (to get settings of)
+     *
+     * @return PlotWorld class for that world ! will return null if not a plot world world
+     *
      * @see PlotMain#getWorldSettings(String)
      * @see com.intellectualcrafters.plot.object.PlotWorld
      */
@@ -314,12 +309,11 @@ public class PlotAPI {
     /**
      * Send a message to a player.
      *
-     * @param player
-     *            Player that will receive the message
-     * @param c
-     *            (Caption)
+     * @param player Player that will receive the message
+     * @param c      (Caption)
+     *
      * @see com.intellectualcrafters.plot.util.PlayerFunctions#sendMessage(org.bukkit.entity.Player,
-     *      com.intellectualcrafters.plot.config.C, String...)
+     * com.intellectualcrafters.plot.config.C, String...)
      */
     public void sendMessage(@NotNull final Player player, @NotNull final C c) {
         PlayerFunctions.sendMessage(player, c);
@@ -328,12 +322,10 @@ public class PlotAPI {
     /**
      * Send a message to a player. - Supports color codes
      *
-     * @param player
-     *            Player that will receive the message
-     * @param string
-     *            The message
-     * @see com.intellectualcrafters.plot.util.PlayerFunctions#sendMessage(org.bukkit.entity.Player,
-     *      String)
+     * @param player Player that will receive the message
+     * @param string The message
+     *
+     * @see com.intellectualcrafters.plot.util.PlayerFunctions#sendMessage(org.bukkit.entity.Player, String)
      */
     public void sendMessage(@NotNull final Player player, @NotNull final String string) {
         PlayerFunctions.sendMessage(player, string);
@@ -342,8 +334,8 @@ public class PlotAPI {
     /**
      * Send a message to the console. - Supports color codes
      *
-     * @param msg
-     *            Message that should be sent to the console
+     * @param msg Message that should be sent to the console
+     *
      * @see PlotMain#sendConsoleSenderMessage(String)
      */
     public void sendConsoleMessage(@NotNull final String msg) {
@@ -353,8 +345,8 @@ public class PlotAPI {
     /**
      * Send a message to the console
      *
-     * @param c
-     *            (Caption)
+     * @param c (Caption)
+     *
      * @see #sendConsoleMessage(String)
      * @see com.intellectualcrafters.plot.config.C
      */
@@ -365,8 +357,8 @@ public class PlotAPI {
     /**
      * Register a flag for use in plots
      *
-     * @param flag
-     *            Flag that should be registered
+     * @param flag Flag that should be registered
+     *
      * @see com.intellectualcrafters.plot.flag.FlagManager#addFlag(com.intellectualcrafters.plot.flag.AbstractFlag)
      * @see com.intellectualcrafters.plot.flag.AbstractFlag
      */
@@ -378,6 +370,7 @@ public class PlotAPI {
      * get all the currently registered flags
      *
      * @return array of Flag[]
+     *
      * @see com.intellectualcrafters.plot.flag.FlagManager#getFlags()
      * @see com.intellectualcrafters.plot.flag.AbstractFlag
      */
@@ -388,15 +381,13 @@ public class PlotAPI {
     /**
      * Get a plot based on the ID
      *
-     * @param world
-     *            World in which the plot is located
-     * @param x
-     *            Plot Location X Co-ord
-     * @param z
-     *            Plot Location Z Co-ord
+     * @param world World in which the plot is located
+     * @param x     Plot Location X Co-ord
+     * @param z     Plot Location Z Co-ord
+     *
      * @return plot, null if ID is wrong
-     * @see PlotHelper#getPlot(org.bukkit.World,
-     *      com.intellectualcrafters.plot.object.PlotId)
+     *
+     * @see PlotHelper#getPlot(org.bukkit.World, com.intellectualcrafters.plot.object.PlotId)
      * @see com.intellectualcrafters.plot.object.Plot
      */
     public Plot getPlot(@NotNull final World world, final int x, final int z) {
@@ -406,9 +397,10 @@ public class PlotAPI {
     /**
      * Get a plot based on the location
      *
-     * @param l
-     *            The location that you want to to retrieve the plot from
+     * @param l The location that you want to to retrieve the plot from
+     *
      * @return plot if found, otherwise it creates a temporary plot-
+     *
      * @see PlotHelper#getCurrentPlot(org.bukkit.Location)
      * @see com.intellectualcrafters.plot.object.Plot
      */
@@ -419,9 +411,10 @@ public class PlotAPI {
     /**
      * Get a plot based on the player location
      *
-     * @param player
-     *            Get the current plot for the player location
+     * @param player Get the current plot for the player location
+     *
      * @return plot if found, otherwise it creates a temporary plot
+     *
      * @see #getPlot(org.bukkit.Location)
      * @see com.intellectualcrafters.plot.object.Plot
      */
@@ -432,9 +425,10 @@ public class PlotAPI {
     /**
      * Check whether or not a player has a plot
      *
-     * @param player
-     *            Player that you want to check for
+     * @param player Player that you want to check for
+     *
      * @return true if player has a plot, false if not.
+     *
      * @see #getPlots(org.bukkit.World, org.bukkit.entity.Player, boolean)
      */
     public boolean hasPlot(@NotNull final World world, @NotNull final Player player) {
@@ -444,10 +438,9 @@ public class PlotAPI {
     /**
      * Get all plots for the player
      *
-     * @param plr
-     *            to search for
-     * @param just_owner
-     *            should we just search for owner? Or with rights?
+     * @param plr        to search for
+     * @param just_owner should we just search for owner? Or with rights?
+     *
      * @see com.intellectualcrafters.plot.object.Plot
      */
     public Plot[] getPlots(@NotNull final World world, @NotNull final Player plr, final boolean just_owner) {
@@ -457,8 +450,7 @@ public class PlotAPI {
                 if ((plot.owner != null) && (plot.owner == UUIDHandler.getUUID(plr))) {
                     pPlots.add(plot);
                 }
-            }
-            else {
+            } else {
                 if (plot.hasRights(plr)) {
                     pPlots.add(plot);
                 }
@@ -470,9 +462,10 @@ public class PlotAPI {
     /**
      * Get all plots for the world
      *
-     * @param world
-     *            to get plots of
+     * @param world to get plots of
+     *
      * @return Plot[] - array of plot objects in world
+     *
      * @see PlotMain#getWorldPlots(org.bukkit.World)
      * @see com.intellectualcrafters.plot.object.Plot
      */
@@ -484,6 +477,7 @@ public class PlotAPI {
      * Get all plot worlds
      *
      * @return World[] - array of plot worlds
+     *
      * @see com.intellectualcrafters.plot.PlotMain#getPlotWorlds()
      */
     public String[] getPlotWorlds() {
@@ -493,9 +487,10 @@ public class PlotAPI {
     /**
      * Get if plot world
      *
-     * @param world
-     *            (to check if plot world)
+     * @param world (to check if plot world)
+     *
      * @return boolean (if plot world or not)
+     *
      * @see com.intellectualcrafters.plot.PlotMain#isPlotWorld(org.bukkit.World)
      */
     public boolean isPlotWorld(@NotNull final World world) {
@@ -505,31 +500,33 @@ public class PlotAPI {
     /**
      * Get plot locations
      *
-     * @param p
-     *            Plot that you want to get the locations for
+     * @param p Plot that you want to get the locations for
+     *
      * @return [0] = bottomLc, [1] = topLoc, [2] = home
+     *
      * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotBottomLoc(org.bukkit.World,
-     *      com.intellectualcrafters.plot.object.PlotId)
+     * com.intellectualcrafters.plot.object.PlotId)
      * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotTopLoc(org.bukkit.World,
-     *      com.intellectualcrafters.plot.object.PlotId)
+     * com.intellectualcrafters.plot.object.PlotId)
      * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotHome(org.bukkit.World,
-     *      com.intellectualcrafters.plot.object.Plot)
+     * com.intellectualcrafters.plot.object.Plot)
      * @see com.intellectualcrafters.plot.object.PlotHomePosition
      * @see com.intellectualcrafters.plot.object.Plot
      */
     public Location[] getLocations(@NotNull final Plot p) {
         final World world = Bukkit.getWorld(p.world);
-        return new Location[] { PlotHelper.getPlotBottomLoc(world, p.id), PlotHelper.getPlotTopLoc(world, p.id), PlotHelper.getPlotHome(world, p.id) };
+        return new Location[]{PlotHelper.getPlotBottomLoc(world, p.id), PlotHelper.getPlotTopLoc(world, p.id), PlotHelper.getPlotHome(world, p.id)};
     }
 
     /**
      * Get home location
      *
-     * @param p
-     *            Plot that you want to get the location for
+     * @param p Plot that you want to get the location for
+     *
      * @return plot bottom location
+     *
      * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotHome(org.bukkit.World,
-     *      com.intellectualcrafters.plot.object.Plot)
+     * com.intellectualcrafters.plot.object.Plot)
      * @see com.intellectualcrafters.plot.object.PlotHomePosition
      * @see com.intellectualcrafters.plot.object.Plot
      */
@@ -540,11 +537,12 @@ public class PlotAPI {
     /**
      * Get Bottom Location (min, min, min)
      *
-     * @param p
-     *            Plot that you want to get the location for
+     * @param p Plot that you want to get the location for
+     *
      * @return plot bottom location
+     *
      * @see com.intellectualcrafters.plot.util.PlotHelper#getPlotBottomLoc(org.bukkit.World,
-     *      com.intellectualcrafters.plot.object.PlotId)
+     * com.intellectualcrafters.plot.object.PlotId)
      * @see com.intellectualcrafters.plot.object.Plot
      */
     public Location getBottomLocation(@NotNull final Plot p) {
@@ -555,11 +553,11 @@ public class PlotAPI {
     /**
      * Get Top Location (max, max, max)
      *
-     * @param p
-     *            Plot that you want to get the location for
+     * @param p Plot that you want to get the location for
+     *
      * @return plot top location
-     * @see PlotHelper#getPlotTopLoc(org.bukkit.World,
-     *      com.intellectualcrafters.plot.object.PlotId)
+     *
+     * @see PlotHelper#getPlotTopLoc(org.bukkit.World, com.intellectualcrafters.plot.object.PlotId)
      * @see com.intellectualcrafters.plot.object.Plot
      */
     public Location getTopLocation(@NotNull final Plot p) {
@@ -570,9 +568,10 @@ public class PlotAPI {
     /**
      * Check whether or not a player is in a plot
      *
-     * @param player
-     *            who we're checking for
+     * @param player who we're checking for
+     *
      * @return true if the player is in a plot, false if not-
+     *
      * @see com.intellectualcrafters.plot.util.PlayerFunctions#isInPlot(org.bukkit.entity.Player)
      */
     public boolean isInPlot(@NotNull final Player player) {
@@ -582,8 +581,8 @@ public class PlotAPI {
     /**
      * Register a subcommand
      *
-     * @param c
-     *            SubCommand, that we want to register
+     * @param c SubCommand, that we want to register
+     *
      * @see com.intellectualcrafters.plot.commands.MainCommand#subCommands
      * @see com.intellectualcrafters.plot.commands.SubCommand
      */
@@ -595,6 +594,7 @@ public class PlotAPI {
      * Get the plotMain class
      *
      * @return PlotMain Class
+     *
      * @see com.intellectualcrafters.plot.PlotMain
      */
     public PlotMain getPlotMain() {
@@ -604,13 +604,13 @@ public class PlotAPI {
     /**
      * Get the player plot count
      *
-     * @param world
-     *            Specify the world we want to select the plots from
-     * @param player
-     *            Player, for whom we're getting the plot count
+     * @param world  Specify the world we want to select the plots from
+     * @param player Player, for whom we're getting the plot count
+     *
      * @return the number of plots the player has
+     *
      * @see com.intellectualcrafters.plot.util.PlayerFunctions#getPlayerPlotCount(org.bukkit.World,
-     *      org.bukkit.entity.Player)
+     * org.bukkit.entity.Player)
      */
     public int getPlayerPlotCount(@NotNull final World world, @NotNull final Player player) {
         return PlayerFunctions.getPlayerPlotCount(world, player);
@@ -619,13 +619,13 @@ public class PlotAPI {
     /**
      * Get a collection containing the players plots
      *
-     * @param world
-     *            Specify the world we want to select the plots from
-     * @param player
-     *            Player, for whom we're getting the plots
+     * @param world  Specify the world we want to select the plots from
+     * @param player Player, for whom we're getting the plots
+     *
      * @return a set containing the players plots
+     *
      * @see com.intellectualcrafters.plot.util.PlayerFunctions#getPlayerPlots(org.bukkit.World,
-     *      org.bukkit.entity.Player)
+     * org.bukkit.entity.Player)
      * @see com.intellectualcrafters.plot.object.Plot
      */
     public Set getPlayerPlots(@NotNull final World world, @NotNull final Player player) {
@@ -635,10 +635,10 @@ public class PlotAPI {
     /**
      * Get the numbers of plots, which the player is able to build in
      *
-     * @param player
-     *            Player, for whom we're getting the plots (trusted, helper and
-     *            owner)
+     * @param player Player, for whom we're getting the plots (trusted, helper and owner)
+     *
      * @return the number of allowed plots
+     *
      * @see com.intellectualcrafters.plot.util.PlayerFunctions#getAllowedPlots(org.bukkit.entity.Player)
      */
     public int getAllowedPlots(@NotNull final Player player) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Auto.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
index 535c21a2b..a4908a720 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
@@ -21,12 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import net.milkbowl.vault.economy.Economy;
-
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
@@ -38,9 +32,12 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
+import net.milkbowl.vault.economy.Economy;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
 
-@SuppressWarnings("deprecation")
-public class Auto extends SubCommand {
+@SuppressWarnings("deprecation") public class Auto extends SubCommand {
     public static PlotId lastPlot = new PlotId(0, 0);
 
     public Auto() {
@@ -53,20 +50,16 @@ public class Auto extends SubCommand {
         if (absX > absY) {
             if (id.x > 0) {
                 return new PlotId(id.x, id.y + 1);
-            }
-            else {
+            } else {
                 return new PlotId(id.x, id.y - 1);
             }
-        }
-        else if (absY > absX) {
+        } else if (absY > absX) {
             if (id.y > 0) {
                 return new PlotId(id.x - 1, id.y);
-            }
-            else {
+            } else {
                 return new PlotId(id.x + 1, id.y);
             }
-        }
-        else {
+        } else {
             if (id.x.equals(id.y) && (id.x > 0)) {
                 return new PlotId(id.x, id.y + step);
             }
@@ -89,12 +82,10 @@ public class Auto extends SubCommand {
         String schematic = "";
         if (PlotMain.getPlotWorlds().length == 1) {
             world = Bukkit.getWorld(PlotMain.getPlotWorlds()[0]);
-        }
-        else {
+        } else {
             if (PlotMain.isPlotWorld(plr.getWorld())) {
                 world = plr.getWorld();
-            }
-            else {
+            } else {
                 PlayerFunctions.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
                 return false;
             }
@@ -114,8 +105,7 @@ public class Auto extends SubCommand {
                     if (args.length > 1) {
                         schematic = args[1];
                     }
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     size_x = 1;
                     size_z = 1;
                     schematic = args[0];
@@ -123,8 +113,7 @@ public class Auto extends SubCommand {
                     // "&cError: Invalid size (X,Y)");
                     // return false;
                 }
-            }
-            else {
+            } else {
                 schematic = args[0];
                 // PlayerFunctions.sendMessage(plr, C.NO_PERMISSION);
                 // return false;
@@ -139,8 +128,7 @@ public class Auto extends SubCommand {
         if ((diff + (size_x * size_z)) >= 0) {
             if (diff < 0) {
                 PlayerFunctions.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS_NUM, (-diff - 1) + "");
-            }
-            else {
+            } else {
                 PlayerFunctions.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
             }
             return false;
@@ -188,8 +176,7 @@ public class Auto extends SubCommand {
                 }
                 Auto.lastPlot = getNextPlot(Auto.lastPlot, 1);
             }
-        }
-        else {
+        } else {
             boolean lastPlot = true;
             while (!br) {
                 final PlotId start = getNextPlot(Auto.lastPlot, 1);
@@ -199,8 +186,7 @@ public class Auto extends SubCommand {
                 }
                 if ((PlotMain.getPlots(world).get(start) != null) && (PlotMain.getPlots(world).get(start).owner != null)) {
                     continue;
-                }
-                else {
+                } else {
                     lastPlot = false;
                 }
                 System.out.print("UNOWNED: " + start);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Ban.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Ban.java
index 2bba9b915..5a546b4bd 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Ban.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Ban.java
@@ -1,10 +1,9 @@
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
 
 /**
  * Created 2014-11-09 for PlotSquared
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
index 9c6961e84..6f2df094b 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
@@ -21,11 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import net.milkbowl.vault.economy.Economy;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
@@ -39,6 +34,9 @@ import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SetBlockFast;
+import net.milkbowl.vault.economy.Economy;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 /**
  * @author Citymonstret
@@ -71,8 +69,7 @@ public class Claim extends SubCommand {
                 SchematicHandler.Schematic sch;
                 if (schematic.equals("")) {
                     sch = SchematicHandler.getSchematic(world.SCHEMATIC_FILE);
-                }
-                else {
+                } else {
                     sch = SchematicHandler.getSchematic(schematic);
                     if (sch == null) {
                         sch = SchematicHandler.getSchematic(world.SCHEMATIC_FILE);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clear.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
index a6fdbb265..061bb9fbf 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
@@ -21,9 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
@@ -31,6 +28,8 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 public class Clear extends SubCommand {
 
@@ -44,23 +43,19 @@ public class Clear extends SubCommand {
             // Is console
             if (args.length < 2) {
                 PlotMain.sendConsoleSenderMessage("You need to specify two arguments: ID (0;0) & World (world)");
-            }
-            else {
+            } else {
                 final PlotId id = PlotId.fromString(args[0]);
                 final String world = args[1];
                 if (id == null) {
                     PlotMain.sendConsoleSenderMessage("Invalid Plot ID: " + args[0]);
-                }
-                else {
+                } else {
                     if (!PlotMain.isPlotWorld(world)) {
                         PlotMain.sendConsoleSenderMessage("Invalid plot world: " + world);
-                    }
-                    else {
+                    } else {
                         final Plot plot = PlotHelper.getPlot(Bukkit.getWorld(world), id);
                         if (plot == null) {
                             PlotMain.sendConsoleSenderMessage("Could not find plot " + args[0] + " in world " + world);
-                        }
-                        else {
+                        } else {
                             plot.clear(null, false);
                             PlotMain.sendConsoleSenderMessage("Plot " + plot.getId().toString() + " cleared.");
                         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clipboard.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clipboard.java
index 90245da2f..060f632ed 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clipboard.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Clipboard.java
@@ -21,14 +21,13 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import static com.intellectualcrafters.plot.object.PlotSelection.currentSelection;
-
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotSelection;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
+
+import static com.intellectualcrafters.plot.object.PlotSelection.currentSelection;
 
 public class Clipboard extends SubCommand {
 
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java
index cd2239c4d..a43514bc8 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Command.java
@@ -164,12 +164,12 @@ public enum Command {
     /**
      * Command
      */
-    private final String            command;
+    private final String command;
 
     /**
      * Alias
      */
-    private final String            alias;
+    private final String alias;
 
     /**
      * Permission Node
@@ -177,8 +177,7 @@ public enum Command {
     private final CommandPermission permission;
 
     /**
-     * @param command
-     *            Command "name" (/plot [cmd])
+     * @param command Command "name" (/plot [cmd])
      */
     Command(final String command) {
         this.command = command;
@@ -187,10 +186,8 @@ public enum Command {
     }
 
     /**
-     * @param command
-     *            Command "name" (/plot [cmd])
-     * @param permission
-     *            Command Permission Node
+     * @param command    Command "name" (/plot [cmd])
+     * @param permission Command Permission Node
      */
     Command(final String command, final CommandPermission permission) {
         this.command = command;
@@ -199,10 +196,8 @@ public enum Command {
     }
 
     /**
-     * @param command
-     *            Command "name" (/plot [cmd])
-     * @param alias
-     *            Command Alias
+     * @param command Command "name" (/plot [cmd])
+     * @param alias   Command Alias
      */
     Command(final String command, final String alias) {
         this.command = command;
@@ -211,12 +206,9 @@ public enum Command {
     }
 
     /**
-     * @param command
-     *            Command "name" (/plot [cmd])
-     * @param alias
-     *            Command Alias
-     * @param permission
-     *            Required Permission Node
+     * @param command    Command "name" (/plot [cmd])
+     * @param alias      Command Alias
+     * @param permission Required Permission Node
      */
     Command(final String command, final String alias, final CommandPermission permission) {
         this.command = command;
@@ -240,6 +232,7 @@ public enum Command {
 
     /**
      * @return permission object
+     *
      * @see com.intellectualcrafters.plot.commands.CommandPermission
      */
     public CommandPermission getPermission() {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java
index a0db47f3b..919d5b4ea 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java
@@ -21,9 +21,8 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
+import org.bukkit.entity.Player;
 
 /**
  * Created by Citymonstret on 2014-08-03.
@@ -38,16 +37,15 @@ public class CommandPermission {
     public final String permission;
 
     /**
-     * @param permission
-     *            Command Permission
+     * @param permission Command Permission
      */
     public CommandPermission(final String permission) {
         this.permission = permission.toLowerCase();
     }
 
     /**
-     * @param player
-     *            Does the player have the permission?
+     * @param player Does the player have the permission?
+     *
      * @return true of player has the required permission node
      */
     public boolean hasPermission(final Player player) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Comment.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
index f5ee8be39..9a5f53ccf 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
@@ -21,18 +21,17 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotComment;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.entity.Player;
+
+import java.util.Arrays;
+import java.util.List;
 
 public class Comment extends SubCommand {
 
@@ -62,8 +61,7 @@ public class Comment extends SubCommand {
                 DBFunc.setComment(plr.getWorld().getName(), plot, comment);
 
                 return true;
-            }
-            else {
+            } else {
                 return sendMessage(plr, C.NO_PERMISSION, "plots.comment." + args[0].toLowerCase());
             }
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Copy.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Copy.java
index 12e6d9ead..7e011cbe0 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Copy.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Copy.java
@@ -21,14 +21,13 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotSelection;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
+import org.bukkit.entity.Player;
 
 public class Copy extends SubCommand {
 
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DEOP.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DEOP.java
index c48982e6f..1d0588ad8 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DEOP.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DEOP.java
@@ -1,10 +1,9 @@
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
 
 /**
  * Created 2014-11-09 for PlotSquared
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java
index cdf78e998..d7323ddcf 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java
@@ -1,15 +1,5 @@
 package com.intellectualcrafters.plot.commands;
 
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.UUID;
-
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.database.MySQL;
 import com.intellectualcrafters.plot.database.SQLManager;
@@ -17,6 +7,15 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.StringComparison;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.UUID;
 
 /**
  * Created 2014-11-15 for PlotSquared
@@ -25,7 +24,7 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
  */
 public class Database extends SubCommand {
 
-    final String[] tables = new String[] { "plot_trusted", "plot_ratings", "plot_comments" };
+    final String[] tables = new String[]{"plot_trusted", "plot_ratings", "plot_comments"};
 
     public Database() {
         super(Command.DATABASE, "Convert/Backup Storage", "database [type] [...details]", CommandCategory.DEBUG, false);
@@ -34,13 +33,11 @@ public class Database extends SubCommand {
     private static boolean sendMessageU(final UUID uuid, final String msg) {
         if (uuid == null) {
             PlotMain.sendConsoleSenderMessage(msg);
-        }
-        else {
+        } else {
             final Player p = UUIDHandler.uuidWrapper.getPlayer(uuid);
             if ((p != null) && p.isOnline()) {
                 return PlayerFunctions.sendMessage(p, msg);
-            }
-            else {
+            } else {
                 return sendMessageU(null, msg);
             }
         }
@@ -61,15 +58,13 @@ public class Database extends SubCommand {
                     manager.createPlots(ps);
                     manager.createAllSettingsAndHelpers(ps);
                     sendMessageU(requester, "&6Database conversion finished");
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     sendMessageU(requester, "Failed to insert plot objects, see stacktrace for info");
                     e.printStackTrace();
                 }
                 try {
                     c.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                 }
             }
@@ -81,7 +76,7 @@ public class Database extends SubCommand {
         if (args.length < 1) {
             return sendMessage(plr, "/plot database [sqlite/mysql]");
         }
-        final String type = new StringComparison(args[0], new String[] { "mysql", "sqlite" }).getBestMatch().toLowerCase();
+        final String type = new StringComparison(args[0], new String[]{"mysql", "sqlite"}).getBestMatch().toLowerCase();
         switch (type) {
             case "mysql":
                 if (args.length < 6) {
@@ -103,8 +98,7 @@ public class Database extends SubCommand {
                     if (n.isClosed()) {
                         return sendMessage(plr, "Failed to open connection");
                     }
-                }
-                catch (SQLException | ClassNotFoundException e) {
+                } catch (SQLException | ClassNotFoundException e) {
                     e.printStackTrace();
                     return sendMessage(plr, "Failed to open connection, read stacktrace for info");
                 }
@@ -114,8 +108,7 @@ public class Database extends SubCommand {
                     ResultSet set = meta.getTables(null, null, prefix + "plot", null);
                     if (!set.next()) {
                         manager.createTables("mysql", true);
-                    }
-                    else {
+                    } else {
                         for (final String s : this.tables) {
                             set = meta.getTables(null, null, prefix + s, null);
                             if (!set.next()) {
@@ -123,8 +116,7 @@ public class Database extends SubCommand {
                             }
                         }
                     }
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     return sendMessage(plr, "Could not create the required tables and/or load the database") && sendMessage(plr, "Please see the stacktrace for more information");
                 }
@@ -149,8 +141,7 @@ public class Database extends SubCommand {
     private boolean sendMessage(final Player player, final String msg) {
         if (player == null) {
             PlotMain.sendConsoleSenderMessage(msg);
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(player, msg);
         }
         return true;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
index 937e2bf6c..1d871ec67 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
@@ -21,16 +21,15 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.util.Lag;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.RUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
 
 public class Debug extends SubCommand {
 
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
index 16c13eb48..465b6aa6f 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
@@ -21,9 +21,16 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
+import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.events.PlayerClaimPlotEvent;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.object.*;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.UUIDHandler;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
@@ -32,20 +39,8 @@ import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Player;
 
-import com.google.common.collect.BiMap;
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.events.PlayerClaimPlotEvent;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.object.StringWrapper;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import java.util.ArrayList;
+import java.util.UUID;
 
 /**
  * @author Citymonstret
@@ -95,8 +90,7 @@ public class DebugClaimTest extends SubCommand {
 
                 min = new PlotId(Integer.parseInt(split1[0]), Integer.parseInt(split1[1]));
                 max = new PlotId(Integer.parseInt(split2[0]), Integer.parseInt(split2[1]));
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 return !PlayerFunctions.sendMessage(null, "&cInvalid min/max values. &7The values are to Plot IDs in the format &cX;Y &7where X,Y are the plot coords\nThe conversion will only check the plots in the selected area.");
             }
             PlayerFunctions.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Beginning sign to plot conversion. This may take a while...");
@@ -154,8 +148,7 @@ public class DebugClaimTest extends SubCommand {
                                 plot.owner = uuid;
                                 plot.hasChanged = true;
                                 plots.add(plot);
-                            }
-                            else {
+                            } else {
                                 PlayerFunctions.sendMessage(null, " - &cInvalid playername: " + plot.id + " : " + line);
                             }
                         }
@@ -174,13 +167,11 @@ public class DebugClaimTest extends SubCommand {
 
                 PlayerFunctions.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Complete!");
 
-            }
-            else {
+            } else {
                 PlayerFunctions.sendMessage(null, "No plots were found for the given search.");
             }
 
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(plr, "This debug command can only be executed by console as it has been deemed unsafe if abused.");
         }
         return true;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java
index 4a06488ed..66f81f8db 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java
@@ -21,13 +21,12 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.lang.reflect.Field;
-
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
+
+import java.lang.reflect.Field;
 
 /**
  * @author Citymonstret
@@ -45,14 +44,12 @@ public class DebugLoadTest extends SubCommand {
                 final Field fPlots = PlotMain.class.getDeclaredField("plots");
                 fPlots.setAccessible(true);
                 fPlots.set(null, DBFunc.getPlots());
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 PlotMain.sendConsoleSenderMessage("&3===FAILED&3===");
                 e.printStackTrace();
                 PlotMain.sendConsoleSenderMessage("&3===END OF STACKTRACE===");
             }
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(plr, "This debug command can only be executed by console as it has been deemed unsafe if abused.");
         }
         return true;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java
index 3601f3a44..c8af90319 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java
@@ -21,14 +21,13 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
 
 /**
  * @author Citymonstret
@@ -46,8 +45,7 @@ public class DebugSaveTest extends SubCommand {
             plots.addAll(PlotMain.getPlots());
             DBFunc.createPlots(plots);
             DBFunc.createAllSettingsAndHelpers(plots);
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(plr, "This debug command can only be executed by console as it has been deemed unsafe if abused.");
         }
         return true;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
index e149eb3a8..95f25d9aa 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
@@ -21,16 +21,14 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import net.milkbowl.vault.economy.Economy;
-
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import net.milkbowl.vault.economy.Economy;
+import org.bukkit.entity.Player;
 
 public class Delete extends SubCommand {
 
@@ -67,8 +65,7 @@ public class Delete extends SubCommand {
             if ((Math.abs(plot.id.x) <= Math.abs(Auto.lastPlot.x)) && (Math.abs(plot.id.y) <= Math.abs(Auto.lastPlot.y))) {
                 Auto.lastPlot = plot.id;
             }
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(plr, "Plot deletion has been denied.");
         }
         return true;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java
index c6cf48e43..ccb7f7185 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java
@@ -21,12 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
@@ -34,9 +28,13 @@ import com.intellectualcrafters.plot.events.PlayerPlotDeniedEvent;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 
-@SuppressWarnings("deprecation")
-public class Denied extends SubCommand {
+import java.util.UUID;
+
+@SuppressWarnings("deprecation") public class Denied extends SubCommand {
 
     public Denied() {
         super(Command.DENIED, "Manage plot helpers", "denied {add|remove} {player}", CommandCategory.ACTIONS, true);
@@ -62,8 +60,7 @@ public class Denied extends SubCommand {
             if (args[1].equalsIgnoreCase("*")) {
                 uuid = DBFunc.everyone;
 
-            }
-            else {
+            } else {
                 uuid = UUIDHandler.getUUID(args[1]);
             }
             if (!plot.denied.contains(uuid)) {
@@ -88,8 +85,7 @@ public class Denied extends SubCommand {
                 DBFunc.setDenied(plr.getWorld().getName(), plot, Bukkit.getOfflinePlayer(args[1]));
                 final PlayerPlotDeniedEvent event = new PlayerPlotDeniedEvent(plr, plot, uuid, true);
                 Bukkit.getPluginManager().callEvent(event);
-            }
-            else {
+            } else {
                 PlayerFunctions.sendMessage(plr, C.ALREADY_ADDED);
                 return false;
             }
@@ -103,8 +99,7 @@ public class Denied extends SubCommand {
             }
             PlayerFunctions.sendMessage(plr, C.DENIED_ADDED);
             return true;
-        }
-        else if (args[0].equalsIgnoreCase("remove")) {
+        } else if (args[0].equalsIgnoreCase("remove")) {
             if (args[1].equalsIgnoreCase("*")) {
                 final UUID uuid = DBFunc.everyone;
                 if (!plot.denied.contains(uuid)) {
@@ -134,8 +129,7 @@ public class Denied extends SubCommand {
             final PlayerPlotDeniedEvent event = new PlayerPlotDeniedEvent(plr, plot, uuid, false);
             Bukkit.getPluginManager().callEvent(event);
             PlayerFunctions.sendMessage(plr, C.DENIED_REMOVED);
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(plr, C.DENIED_NEED_ARGUMENT);
             return true;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java
index 1702f23b6..2a298b3dd 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java
@@ -21,12 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
@@ -34,9 +28,13 @@ import com.intellectualcrafters.plot.events.PlayerPlotHelperEvent;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 
-@SuppressWarnings("deprecation")
-public class Helpers extends SubCommand {
+import java.util.UUID;
+
+@SuppressWarnings("deprecation") public class Helpers extends SubCommand {
 
     public Helpers() {
         super(Command.HELPERS, "Manage plot helpers", "helpers {add|remove} {player}", CommandCategory.ACTIONS, true);
@@ -61,8 +59,7 @@ public class Helpers extends SubCommand {
             UUID uuid;
             if (args[1].equalsIgnoreCase("*")) {
                 uuid = DBFunc.everyone;
-            }
-            else {
+            } else {
                 uuid = UUIDHandler.getUUID(args[1]);
             }
             if (!plot.helpers.contains(uuid)) {
@@ -87,15 +84,13 @@ public class Helpers extends SubCommand {
                 DBFunc.setHelper(plr.getWorld().getName(), plot, Bukkit.getOfflinePlayer(args[1]));
                 final PlayerPlotHelperEvent event = new PlayerPlotHelperEvent(plr, plot, uuid, true);
                 Bukkit.getPluginManager().callEvent(event);
-            }
-            else {
+            } else {
                 PlayerFunctions.sendMessage(plr, C.ALREADY_ADDED);
                 return false;
             }
             PlayerFunctions.sendMessage(plr, C.HELPER_ADDED);
             return true;
-        }
-        else if (args[0].equalsIgnoreCase("remove")) {
+        } else if (args[0].equalsIgnoreCase("remove")) {
             if (args[1].equalsIgnoreCase("*")) {
                 final UUID uuid = DBFunc.everyone;
                 if (!plot.helpers.contains(uuid)) {
@@ -126,8 +121,7 @@ public class Helpers extends SubCommand {
             final PlayerPlotHelperEvent event = new PlayerPlotHelperEvent(plr, plot, uuid, false);
             Bukkit.getPluginManager().callEvent(event);
             PlayerFunctions.sendMessage(plr, C.HELPER_REMOVED);
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(plr, C.HELPER_NEED_ARGUMENT);
             return true;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Home.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Home.java
index aeed0b43c..2dbf6db91 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Home.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Home.java
@@ -21,12 +21,11 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
 
 /**
  * @author Citymonstret
@@ -52,16 +51,14 @@ public class Home extends SubCommand {
         if (plots.length == 1) {
             PlotMain.teleportPlayer(plr, plr.getLocation(), plots[0]);
             return true;
-        }
-        else if (plots.length > 1) {
+        } else if (plots.length > 1) {
             if (args.length < 1) {
-                args = new String[] { "1" };
+                args = new String[]{"1"};
             }
             int id = 0;
             try {
                 id = Integer.parseInt(args[0]);
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 Plot temp;
                 if ((temp = isAlias(args[0])) != null) {
                     if (temp.hasOwner()) {
@@ -82,8 +79,7 @@ public class Home extends SubCommand {
             }
             PlotMain.teleportPlayer(plr, plr.getLocation(), plots[id - 1]);
             return true;
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(plr, C.NO_PLOTS);
             return true;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
index e0ab03c8b..f4ea43fc0 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
@@ -21,20 +21,19 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotComment;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
 
 public class Inbox extends SubCommand {
 
@@ -58,17 +57,13 @@ public class Inbox extends SubCommand {
         final UUID uuid = plr.getUniqueId();
         if (PlotMain.hasPermission(plr, "plots.admin")) {
             tier = 0;
-        }
-        else if (plot.owner == uuid) {
+        } else if (plot.owner == uuid) {
             tier = 1;
-        }
-        else if (plot.helpers.contains(uuid)) {
+        } else if (plot.helpers.contains(uuid)) {
             tier = 2;
-        }
-        else if (plot.trusted.contains(uuid)) {
+        } else if (plot.trusted.contains(uuid)) {
             tier = 3;
-        }
-        else {
+        } else {
             tier = 4;
         }
 
@@ -77,8 +72,7 @@ public class Inbox extends SubCommand {
                 case "admin":
                     if (tier <= 0) {
                         tier = 0;
-                    }
-                    else {
+                    } else {
                         PlayerFunctions.sendMessage(plr, C.NO_PERM_INBOX);
                         return false;
                     }
@@ -86,8 +80,7 @@ public class Inbox extends SubCommand {
                 case "owner":
                     if (tier <= 1) {
                         tier = 1;
-                    }
-                    else {
+                    } else {
                         PlayerFunctions.sendMessage(plr, C.NO_PERM_INBOX);
                         return false;
                     }
@@ -95,8 +88,7 @@ public class Inbox extends SubCommand {
                 case "helper":
                     if (tier <= 2) {
                         tier = 2;
-                    }
-                    else {
+                    } else {
                         PlayerFunctions.sendMessage(plr, C.NO_PERM_INBOX);
                         return false;
                     }
@@ -104,8 +96,7 @@ public class Inbox extends SubCommand {
                 case "trusted":
                     if (tier <= 3) {
                         tier = 3;
-                    }
-                    else {
+                    } else {
                         PlayerFunctions.sendMessage(plr, C.NO_PERM_INBOX);
                         return false;
                     }
@@ -113,14 +104,13 @@ public class Inbox extends SubCommand {
                 case "everyone":
                     if (tier <= 4) {
                         tier = 4;
-                    }
-                    else {
+                    } else {
                         PlayerFunctions.sendMessage(plr, C.NO_PERM_INBOX);
                         return false;
                     }
                     break;
                 case "default":
-                    PlayerFunctions.sendMessage(plr, C.INVALID_INBOX, Arrays.copyOfRange(new String[] { "admin", "owner", "helper", "trusted", "everyone" }, tier, 4));
+                    PlayerFunctions.sendMessage(plr, C.INVALID_INBOX, Arrays.copyOfRange(new String[]{"admin", "owner", "helper", "trusted", "everyone"}, tier, 4));
                     return false;
             }
         }
@@ -151,8 +141,7 @@ public class Inbox extends SubCommand {
                             plot.settings.removeComment(comment);
                             PlayerFunctions.sendMessage(plr, C.COMMENT_REMOVED, "1 comment");
                             return;
-                        }
-                        catch (final Exception e) {
+                        } catch (final Exception e) {
                             PlayerFunctions.sendMessage(plr, "&cInvalid index:\n/plot inbox [tier] [clear][:#]");
                             return;
                         }
@@ -162,8 +151,7 @@ public class Inbox extends SubCommand {
                     }
                     plot.settings.removeComments(comments);
                     PlayerFunctions.sendMessage(plr, C.COMMENT_REMOVED, "all comments in that category");
-                }
-                else {
+                } else {
                     final List recipients = Arrays.asList("A", "O", "H", "T", "E");
                     int count = 1;
                     final StringBuilder message = new StringBuilder();
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java
index ecdca4d0f..3db811c69 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Info.java
@@ -21,16 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-import java.util.UUID;
-
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
@@ -41,12 +31,20 @@ import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Biome;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.UUID;
 
 /**
  * @author Citymonstret
  */
-@SuppressWarnings({ "unused", "deprecated", "javadoc" })
-public class Info extends SubCommand {
+@SuppressWarnings({"unused", "deprecated", "javadoc"}) public class Info extends SubCommand {
 
     public Info() {
         super(Command.INFO, "Display plot info", "info", CommandCategory.INFO, false);
@@ -63,8 +61,7 @@ public class Info extends SubCommand {
                 return false;
             }
             plot = PlayerFunctions.getCurrentPlot(player);
-        }
-        else {
+        } else {
             if (args.length < 2) {
                 PlayerFunctions.sendMessage(null, C.INFO_SYNTAX_CONSOLE);
                 return false;
@@ -84,13 +81,11 @@ public class Info extends SubCommand {
                 }
                 world = Bukkit.getWorld(args[0]);
                 if (args.length == 3) {
-                    args = new String[] { args[2] };
-                }
-                else {
+                    args = new String[]{args[2]};
+                } else {
                     args = new String[0];
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 PlayerFunctions.sendMessage(player, C.INFO_SYNTAX_CONSOLE);
                 return false;
             }
@@ -215,8 +210,7 @@ public class Info extends SubCommand {
         for (int x = 0; x < l.size(); x++) {
             if ((x + 1) == l.size()) {
                 list.append(c.replace("%user%", getPlayerName(l.get(x))).replace(",", ""));
-            }
-            else {
+            } else {
                 list.append(c.replace("%user%", getPlayerName(l.get(x))));
             }
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java
index 4921d16ac..326ffea40 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Inventory.java
@@ -21,8 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -30,6 +28,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
+import java.util.ArrayList;
+
 public class Inventory extends SubCommand {
 
     public Inventory() {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
index be95b725c..dac097866 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
@@ -21,16 +21,14 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
-@SuppressWarnings({ "unused", "deprecation", "javadoc" })
-public class Kick extends SubCommand {
+@SuppressWarnings({"unused", "deprecation", "javadoc"}) public class Kick extends SubCommand {
 
     public Kick() {
         super(Command.KICK, "Kick a player from your plot", "kick", CommandCategory.ACTIONS, true);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
index 902bafd9d..df032b44f 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
@@ -21,10 +21,10 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
+import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.StringComparison;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -32,10 +32,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.StringComparison;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * PlotMain command class
@@ -47,11 +46,11 @@ public class MainCommand implements CommandExecutor, TabCompleter {
     /**
      * Main Permission Node
      */
-    public static final String                MAIN_PERMISSION = "plots.use";
+    public static final String MAIN_PERMISSION = "plots.use";
 
-    private final static SubCommand[]         _subCommands    = new SubCommand[] { new Ban(), new Unban(), new OP(), new DEOP(), new Claim(), new Paste(), new Copy(), new Clipboard(), new Auto(), new Home(), new Visit(), new TP(), new Set(), new Clear(), new Delete(), new SetOwner(), new Denied(), new Helpers(), new Trusted(), new Info(), new list(), new Help(), new Debug(), new Schematic(), new plugin(), new Inventory(), new Purge(), new Reload(), new Merge(), new Unlink(), new Kick(), new Setup(), new Rate(), new DebugClaimTest(), new Inbox(), new Comment(), new Database(), new Unclaim(), new Swap(), new MusicSubcommand() };
+    private final static SubCommand[] _subCommands = new SubCommand[]{new Ban(), new Unban(), new OP(), new DEOP(), new Claim(), new Paste(), new Copy(), new Clipboard(), new Auto(), new Home(), new Visit(), new TP(), new Set(), new Clear(), new Delete(), new SetOwner(), new Denied(), new Helpers(), new Trusted(), new Info(), new list(), new Help(), new Debug(), new Schematic(), new plugin(), new Inventory(), new Purge(), new Reload(), new Merge(), new Unlink(), new Kick(), new Setup(), new Rate(), new DebugClaimTest(), new Inbox(), new Comment(), new Database(), new Unclaim(), new Swap(), new MusicSubcommand()};
 
-    public final static ArrayList subCommands     = new ArrayList() {
+    public final static ArrayList subCommands = new ArrayList() {
         {
             addAll(Arrays.asList(_subCommands));
         }
@@ -75,7 +74,7 @@ public class MainCommand implements CommandExecutor, TabCompleter {
     public static List helpMenu(final Player player, final SubCommand.CommandCategory category, int page) {
         final List commands = getCommands(category, player);
         // final int totalPages = ((int) Math.ceil(12 * (commands.size()) /
-                // 100));
+        // 100));
         final int perPage = 5;
         final int totalPages = (int) Math.ceil(commands.size() / perPage);
         if (page > totalPages) {
@@ -152,8 +151,7 @@ public class MainCommand implements CommandExecutor, TabCompleter {
             String arg2;
             if (args.length > 2) {
                 arg2 = args[2];
-            }
-            else {
+            } else {
                 arg2 = "1";
             }
 
@@ -175,8 +173,7 @@ public class MainCommand implements CommandExecutor, TabCompleter {
             }
             sender.sendMessage(ChatColor.translateAlternateColorCodes('&', help.toString()));
             // return PlayerFunctions.sendMessage(player, help.toString());
-        }
-        else {
+        } else {
             for (final SubCommand command : subCommands) {
                 if (command.cmd.equalsIgnoreCase(args[0]) || command.alias.contains(args[0].toLowerCase())) {
                     final String[] arguments = new String[args.length - 1];
@@ -184,12 +181,10 @@ public class MainCommand implements CommandExecutor, TabCompleter {
                     if (command.permission.hasPermission(player)) {
                         if ((player != null) || !command.isPlayer) {
                             return command.execute(player, arguments);
-                        }
-                        else {
+                        } else {
                             return !PlayerFunctions.sendMessage(null, C.IS_CONSOLE);
                         }
-                    }
-                    else {
+                    } else {
                         return no_permission(player, command.permission.permission.toLowerCase());
                     }
                 }
@@ -234,8 +229,7 @@ public class MainCommand implements CommandExecutor, TabCompleter {
             if (cmd.permission.hasPermission(player)) {
                 if (cmd.cmd.startsWith(arg)) {
                     tabOptions.add(cmd.cmd);
-                }
-                else if (cmd.alias.get(0).startsWith(arg)) {
+                } else if (cmd.alias.get(0).startsWith(arg)) {
                     tabOptions.add(cmd.alias.get(0));
                 }
             }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
index f98c36642..6dfc5eecd 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
@@ -21,15 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-
-import net.milkbowl.vault.economy.Economy;
-
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.events.PlotMergeEvent;
@@ -39,14 +30,21 @@ import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.SetBlockFast;
+import net.milkbowl.vault.economy.Economy;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
 
 /**
  * @author Citymonstret
  */
 public class Merge extends SubCommand {
 
-    public final static String[] values  = new String[] { "north", "east", "south", "west" };
-    public final static String[] aliases = new String[] { "n", "e", "s", "w" };
+    public final static String[] values = new String[]{"north", "east", "south", "west"};
+    public final static String[] aliases = new String[]{"n", "e", "s", "w"};
 
     public Merge() {
         super(Command.MERGE, "Merge the plot you are standing on with another plot.", "merge", CommandCategory.ACTIONS, true);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java
index b8622f16c..426dc02af 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java
@@ -21,18 +21,17 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.Arrays;
-
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.listeners.PlotPlusListener;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.listeners.PlotPlusListener;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import java.util.Arrays;
 
 public class MusicSubcommand extends SubCommand {
     public MusicSubcommand() {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/OP.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/OP.java
index 67d789621..406586f5e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/OP.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/OP.java
@@ -1,10 +1,9 @@
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
 
 /**
  * Created 2014-11-09 for PlotSquared
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Paste.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Paste.java
index 16fbeb15f..162d95d83 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Paste.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Paste.java
@@ -21,14 +21,13 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotSelection;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
+import org.bukkit.entity.Player;
 
 public class Paste extends SubCommand {
 
@@ -62,8 +61,7 @@ public class Paste extends SubCommand {
             }
             selection.paste(plr.getWorld(), plot);
             sendMessage(plr, C.PASTED);
-        }
-        else {
+        } else {
             sendMessage(plr, C.NO_CLIPBOARD);
             return false;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Purge.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
index 33f0d6e8b..b42e3a5c8 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
@@ -21,16 +21,14 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
 
-@SuppressWarnings({ "unused", "deprecated", "javadoc" })
-public class Purge extends SubCommand {
+@SuppressWarnings({"unused", "deprecated", "javadoc"}) public class Purge extends SubCommand {
 
     public Purge() {
         super("purge", "plots.admin", "Purge all plots for a world", "purge", "", CommandCategory.DEBUG, false);
@@ -60,8 +58,7 @@ public class Purge extends SubCommand {
                     DBFunc.purge(world, id);
                     PlayerFunctions.sendMessage(null, "&aPurge of '" + args[0] + "' was successful!");
                     return true;
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_ID);
                 }
             }
@@ -77,8 +74,7 @@ public class Purge extends SubCommand {
             DBFunc.purge(args[0]);
             PlayerFunctions.sendMessage(plr, (C.PURGE_SUCCESS));
             return true;
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(plr, "This is a dangerous command, if you are sure, use /plot purge {world} -o");
             return false;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Rate.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
index 1a8619204..a58ce1d3e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
@@ -21,15 +21,13 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
 
-@SuppressWarnings({ "unused", "deprecated", "javadoc" })
-public class Rate extends SubCommand {
+@SuppressWarnings({"unused", "deprecated", "javadoc"}) public class Rate extends SubCommand {
 
     /*
      * String cmd, String permission, String description, String usage, String
@@ -79,8 +77,7 @@ public class Rate extends SubCommand {
         boolean rated = true;
         try {
             DBFunc.getRatings(plot);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             rated = false;
         }
 
@@ -90,8 +87,7 @@ public class Rate extends SubCommand {
         final boolean success = true;
         if (success) {
             sendMessage(plr, C.RATING_APPLIED, plot.getId().toString());
-        }
-        else {
+        } else {
             sendMessage(plr, C.COMMAND_WENT_WRONG);
         }
         return true;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java
index 9a286281a..e5a43f8d8 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Reload.java
@@ -21,12 +21,11 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
 
 public class Reload extends SubCommand {
 
@@ -47,8 +46,7 @@ public class Reload extends SubCommand {
                 plotworld.loadDefaultConfiguration(PlotMain.config.getConfigurationSection("worlds." + pw));
             }
             PlotMain.BroadcastWithPerms(C.RELOADED_CONFIGS);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             PlayerFunctions.sendMessage(plr, C.RELOAD_FAILED);
         }
         return true;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java
index 5ff53f584..a6748ac4a 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Schematic.java
@@ -21,35 +21,30 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
 import com.intellectualcrafters.jnbt.CompoundTag;
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.intellectualcrafters.plot.util.SchematicHandler;
+import com.intellectualcrafters.plot.util.*;
 import com.intellectualcrafters.plot.util.SchematicHandler.DataCollection;
 import com.intellectualcrafters.plot.util.SchematicHandler.Dimension;
-import com.intellectualcrafters.plot.util.SetBlockFast;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import java.util.Collection;
+import java.util.HashMap;
 
 public class Schematic extends SubCommand {
 
-    private int     counter = 0;
+    private int counter = 0;
     private boolean running = false;
-    private Plot[]  plots;
-    private int     task;
+    private Plot[] plots;
+    private int task;
 
     public Schematic() {
         super("schematic", "plots.schematic", "Schematic Command", "schematic {arg}", "sch", CommandCategory.ACTIONS, false);
@@ -119,8 +114,7 @@ public class Schematic extends SubCommand {
                             final Location loc = plr.getLocation();
                             x = Math.min(length2 - dem.getX(), loc.getBlockX() - bot.getBlockX());
                             z = Math.min(length2 - dem.getZ(), loc.getBlockZ() - bot.getBlockZ());
-                        }
-                        else {
+                        } else {
                             x = 0;
                             z = 0;
                         }
@@ -237,8 +231,7 @@ public class Schematic extends SubCommand {
                         final String owner = o == null ? "unknown" : o;
                         if (sch == null) {
                             PlayerFunctions.sendMessage(null, "&7 - Skipped plot &c" + plot.id);
-                        }
-                        else {
+                        } else {
                             Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"), new Runnable() {
                                 @Override
                                 public void run() {
@@ -246,8 +239,7 @@ public class Schematic extends SubCommand {
                                     final boolean result = SchematicHandler.save(sch, Settings.SCHEMATIC_SAVE_PATH + "/" + plot.id.x + ";" + plot.id.y + "," + worldname + "," + owner + ".schematic");
                                     if (!result) {
                                         PlayerFunctions.sendMessage(null, "&7 - Failed to save &c" + plot.id);
-                                    }
-                                    else {
+                                    } else {
                                         PlayerFunctions.sendMessage(null, "&7 - &aExport success: " + plot.id);
                                     }
                                 }
@@ -281,8 +273,7 @@ public class Schematic extends SubCommand {
                     }
                     p2 = myplot;
                     world = plr.getWorld().getName();
-                }
-                else {
+                } else {
                     if (args.length == 3) {
                         try {
                             world = args[0];
@@ -293,13 +284,11 @@ public class Schematic extends SubCommand {
                                 return false;
                             }
                             p2 = PlotMain.getPlots(world).get(i);
-                        }
-                        catch (final Exception e) {
+                        } catch (final Exception e) {
                             PlayerFunctions.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save  ");
                             return false;
                         }
-                    }
-                    else {
+                    } else {
                         PlayerFunctions.sendMessage(null, "&cInvalid world or id. Use &7/plots sch save  ");
                         return false;
                     }
@@ -307,7 +296,7 @@ public class Schematic extends SubCommand {
 
                 final Plugin plugin2 = Bukkit.getServer().getPluginManager().getPlugin("PlotSquared");
 
-                this.plots = new Plot[] { p2 };
+                this.plots = new Plot[]{p2};
                 this.running = true;
                 this.counter = 0;
 
@@ -326,8 +315,7 @@ public class Schematic extends SubCommand {
                         final String owner = o == null ? "unknown" : o;
                         if (sch == null) {
                             PlayerFunctions.sendMessage(plr, "&7 - Skipped plot &c" + plot.id);
-                        }
-                        else {
+                        } else {
                             Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getServer().getPluginManager().getPlugin("PlotSquared"), new Runnable() {
                                 @Override
                                 public void run() {
@@ -335,8 +323,7 @@ public class Schematic extends SubCommand {
                                     final boolean result = SchematicHandler.save(sch, Settings.SCHEMATIC_SAVE_PATH + "/" + plot.id.x + ";" + plot.id.y + "," + world + "," + owner.trim() + ".schematic");
                                     if (!result) {
                                         PlayerFunctions.sendMessage(plr, "&7 - Failed to save &c" + plot.id);
-                                    }
-                                    else {
+                                    } else {
                                         PlayerFunctions.sendMessage(plr, "&7 - &aExport success: " + plot.id);
                                     }
                                 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java
index 766bc08fd..fe5bce4b6 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Set.java
@@ -21,17 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Biome;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
@@ -48,14 +37,24 @@ import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.StringComparison;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.block.Biome;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author Citymonstret
  */
 public class Set extends SubCommand {
 
-    public final static String[] values  = new String[] { "biome", "wall", "wall_filling", "floor", "alias", "home", "flag" };
-    public final static String[] aliases = new String[] { "b", "w", "wf", "f", "a", "h", "fl" };
+    public final static String[] values = new String[]{"biome", "wall", "wall_filling", "floor", "alias", "home", "flag"};
+    public final static String[] aliases = new String[]{"b", "w", "wf", "f", "a", "h", "fl"};
 
     public Set() {
         super(Command.SET, "Set a plot value", "set {arg} {value...}", CommandCategory.ACTIONS, true);
@@ -100,8 +99,7 @@ public class Set extends SubCommand {
                 if (PlotMain.worldGuardListener != null) {
                     if (message.equals("")) {
                         message = StringUtils.join(PlotMain.worldGuardListener.str_flags, "&c, &6");
-                    }
-                    else {
+                    } else {
                         message += "," + StringUtils.join(PlotMain.worldGuardListener.str_flags, "&c, &6");
                     }
                 }
@@ -113,8 +111,7 @@ public class Set extends SubCommand {
 
             try {
                 af = FlagManager.getFlag(args[1].toLowerCase());
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 af = new AbstractFlag(args[1].toLowerCase());
             }
 
@@ -183,8 +180,7 @@ public class Set extends SubCommand {
                 PlayerFunctions.sendMessage(plr, C.FLAG_ADDED);
                 PlotListener.plotEntry(plr, plot);
                 return true;
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 PlayerFunctions.sendMessage(plr, "&c" + e.getMessage());
                 return false;
             }
@@ -275,8 +271,7 @@ public class Set extends SubCommand {
             Material material;
             try {
                 material = getMaterial(args[1], PlotWorld.BLOCKS);
-            }
-            catch (final NullPointerException e) {
+            } catch (final NullPointerException e) {
                 material = null;
             }
             /*
@@ -296,8 +291,7 @@ public class Set extends SubCommand {
             if (args.length > 2) {
                 try {
                     data = (byte) Integer.parseInt(args[2]);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     PlayerFunctions.sendMessage(plr, C.NOT_VALID_DATA);
                     return true;
                 }
@@ -317,8 +311,7 @@ public class Set extends SubCommand {
                 return true;
             }
             //
-            @SuppressWarnings("unchecked")
-            final ArrayList materials = (ArrayList) ((ArrayList) PlotWorld.BLOCKS).clone();
+            @SuppressWarnings("unchecked") final ArrayList materials = (ArrayList) ((ArrayList) PlotWorld.BLOCKS).clone();
             materials.add(Material.AIR);
             //
             final String[] strings = args[1].split(",");
@@ -352,13 +345,11 @@ public class Set extends SubCommand {
                 if (ss.length == 1) {
 
                     blocks[index] = new PlotBlock((short) m.getId(), (byte) 0);
-                }
-                else {
+                } else {
                     byte b;
                     try {
                         b = (byte) Integer.parseInt(ss[1]);
-                    }
-                    catch (final Exception e) {
+                    } catch (final Exception e) {
                         PlayerFunctions.sendMessage(plr, C.NOT_VALID_DATA);
                         return true;
                     }
@@ -402,8 +393,7 @@ public class Set extends SubCommand {
             if (args.length > 2) {
                 try {
                     data = (byte) Integer.parseInt(args[2]);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     PlayerFunctions.sendMessage(plr, C.NOT_VALID_DATA);
                     return true;
                 }
@@ -415,8 +405,7 @@ public class Set extends SubCommand {
             AbstractFlag af;
             try {
                 af = new AbstractFlag(args[0].toLowerCase());
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 af = new AbstractFlag("");
             }
             if (FlagManager.getFlags().contains(af)) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java
index 13dace7bb..ff6ddc91a 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java
@@ -21,12 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-import java.util.UUID;
-
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
@@ -35,9 +29,13 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
 
-@SuppressWarnings("deprecation")
-public class SetOwner extends SubCommand {
+import java.util.ArrayList;
+import java.util.UUID;
+
+@SuppressWarnings("deprecation") public class SetOwner extends SubCommand {
 
     public SetOwner() {
         super("setowner", "plots.admin", "Set the plot owner", "setowner {player}", "so", CommandCategory.ACTIONS, true);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Setup.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
index a00592e89..e6555b0de 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
@@ -21,11 +21,13 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
+import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.ConfigurationNode;
+import com.intellectualcrafters.plot.generator.DefaultPlotWorld;
+import com.intellectualcrafters.plot.object.PlotGenerator;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -35,13 +37,10 @@ import org.bukkit.event.Listener;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;
 
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.ConfigurationNode;
-import com.intellectualcrafters.plot.generator.DefaultPlotWorld;
-import com.intellectualcrafters.plot.object.PlotGenerator;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created 2014-09-26 for PlotSquared
@@ -62,8 +61,7 @@ public class Setup extends SubCommand implements Listener {
 
         if (plr == null) {
             plrname = "";
-        }
-        else {
+        } else {
             plrname = plr.getName();
         }
 
@@ -77,20 +75,17 @@ public class Setup extends SubCommand implements Listener {
                 }
                 try {
                     PlotMain.config.save(PlotMain.configFile);
-                }
-                catch (final IOException e) {
+                } catch (final IOException e) {
                     e.printStackTrace();
                 }
 
                 // Creating the worlds
                 if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
                     Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv create " + world + " normal -g " + object.plugin);
-                }
-                else {
+                } else {
                     if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
                         Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + world + " plugin:" + object.plugin);
-                    }
-                    else {
+                    } else {
                         for (final Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
                             if (plugin.isEnabled()) {
                                 if (plugin.getDefaultWorldGenerator("world", "") != null) {
@@ -120,8 +115,7 @@ public class Setup extends SubCommand implements Listener {
             if (args.length < 1) {
                 sendMessage(plr, C.SETUP_STEP, object.current + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                 return true;
-            }
-            else {
+            } else {
                 if (args[0].equalsIgnoreCase("cancel")) {
                     setupMap.remove(plrname);
                     PlayerFunctions.sendMessage(plr, "&cCancelled setup.");
@@ -133,8 +127,7 @@ public class Setup extends SubCommand implements Listener {
                         step = object.step[object.current];
                         sendMessage(plr, C.SETUP_STEP, object.current + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                         return true;
-                    }
-                    else {
+                    } else {
                         sendMessage(plr, C.SETUP_STEP, object.current + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                         return true;
                     }
@@ -151,15 +144,13 @@ public class Setup extends SubCommand implements Listener {
                     step = object.step[object.current];
                     sendMessage(plr, C.SETUP_STEP, object.current + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                     return true;
-                }
-                else {
+                } else {
                     sendMessage(plr, C.SETUP_INVALID_ARG, args[0], step.getConstant());
                     sendMessage(plr, C.SETUP_STEP, object.current + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                     return true;
                 }
             }
-        }
-        else {
+        } else {
             if (args.length < 1) {
                 sendMessage(plr, C.SETUP_MISSING_WORLD);
                 return true;
@@ -202,8 +193,7 @@ public class Setup extends SubCommand implements Listener {
             PlotWorld plotworld;
             if (generator instanceof PlotGenerator) {
                 plotworld = ((PlotGenerator) generator).getNewPlotWorld(world);
-            }
-            else {
+            } else {
                 plotworld = new DefaultPlotWorld(world);
             }
 
@@ -217,10 +207,10 @@ public class Setup extends SubCommand implements Listener {
     }
 
     private class SetupObject {
-        final String              world;
-        final String              plugin;
+        final String world;
+        final String plugin;
         final ConfigurationNode[] step;
-        int                       current = 0;
+        int current = 0;
 
         public SetupObject(final String world, final PlotWorld plotworld, final String plugin) {
             this.world = world;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java
index 7ce75b777..4d157620e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java
@@ -21,26 +21,24 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * SubCommand class
  *
  * @author Citymonstret
  */
-@SuppressWarnings({ "deprecation", "unused" })
-public abstract class SubCommand {
+@SuppressWarnings({"deprecation", "unused"}) public abstract class SubCommand {
 
     /**
      * Command
      */
-    public final String            cmd;
+    public final String cmd;
     /**
      * Permission node
      */
@@ -48,7 +46,7 @@ public abstract class SubCommand {
     /**
      * Simple description
      */
-    public final String            description;
+    public final String description;
     /**
      * Aliases
      */
@@ -56,29 +54,23 @@ public abstract class SubCommand {
     /**
      * Command usage
      */
-    public final String            usage;
+    public final String usage;
     /**
      * The category
      */
-    public final CommandCategory   category;
+    public final CommandCategory category;
     /**
      * Is this a player-online command?
      */
-    public final boolean           isPlayer;
+    public final boolean isPlayer;
 
     /**
-     * @param cmd
-     *            Command /plot {cmd} <-- That!
-     * @param permission
-     *            Permission Node
-     * @param description
-     *            Simple description
-     * @param usage
-     *            Usage description: /plot command {args...}
-     * @param alias
-     *            Command alias
-     * @param category
-     *            CommandCategory. Pick whichever is closest to what you want.
+     * @param cmd         Command /plot {cmd} <-- That!
+     * @param permission  Permission Node
+     * @param description Simple description
+     * @param usage       Usage description: /plot command {args...}
+     * @param alias       Command alias
+     * @param category    CommandCategory. Pick whichever is closest to what you want.
      */
     public SubCommand(final String cmd, final String permission, final String description, final String usage, final String alias, final CommandCategory category, final boolean isPlayer) {
         this.cmd = cmd;
@@ -92,18 +84,12 @@ public abstract class SubCommand {
     }
 
     /**
-     * @param cmd
-     *            Command /plot {cmd} <-- That!
-     * @param permission
-     *            Permission Node
-     * @param description
-     *            Simple description
-     * @param usage
-     *            Usage description: /plot command {args...}
-     * @param aliases
-     *            Command aliases
-     * @param category
-     *            CommandCategory. Pick whichever is closest to what you want.
+     * @param cmd         Command /plot {cmd} <-- That!
+     * @param permission  Permission Node
+     * @param description Simple description
+     * @param usage       Usage description: /plot command {args...}
+     * @param aliases     Command aliases
+     * @param category    CommandCategory. Pick whichever is closest to what you want.
      */
     public SubCommand(final String cmd, final String permission, final String description, final String usage, final CommandCategory category, final boolean isPlayer, final String... aliases) {
         this.cmd = cmd;
@@ -117,14 +103,10 @@ public abstract class SubCommand {
     }
 
     /**
-     * @param command
-     *            Command /plot {cmd} <-- That!
-     * @param description
-     *            Simple description
-     * @param usage
-     *            Usage description: /plot command {args...}
-     * @param category
-     *            CommandCategory. Pick whichever closests to what you want.
+     * @param command     Command /plot {cmd} <-- That!
+     * @param description Simple description
+     * @param usage       Usage description: /plot command {args...}
+     * @param category    CommandCategory. Pick whichever closests to what you want.
      */
     public SubCommand(final Command command, final String description, final String usage, final CommandCategory category, final boolean isPlayer) {
         this.cmd = command.getCommand();
@@ -140,10 +122,9 @@ public abstract class SubCommand {
     /**
      * Execute.
      *
-     * @param plr
-     *            executor
-     * @param args
-     *            arguments
+     * @param plr  executor
+     * @param args arguments
+     *
      * @return true on success, false on failure
      */
     public abstract boolean execute(final Player plr, final String... args);
@@ -151,8 +132,7 @@ public abstract class SubCommand {
     /**
      * Execute the command as console
      *
-     * @param args
-     *            Arguments
+     * @param args Arguments
      */
     public void executeConsole(final String... args) {
         this.execute(null, args);
@@ -161,14 +141,12 @@ public abstract class SubCommand {
     /**
      * Send a message
      *
-     * @param plr
-     *            Player who will receive the mssage
-     * @param c
-     *            Caption
-     * @param args
-     *            Arguments (%s's)
+     * @param plr  Player who will receive the mssage
+     * @param c    Caption
+     * @param args Arguments (%s's)
+     *
      * @see com.intellectualcrafters.plot.util.PlayerFunctions#sendMessage(org.bukkit.entity.Player,
-     *      com.intellectualcrafters.plot.config.C, String...)
+     * com.intellectualcrafters.plot.config.C, String...)
      */
     public boolean sendMessage(final Player plr, final C c, final String... args) {
         PlayerFunctions.sendMessage(plr, c, args);
@@ -221,8 +199,7 @@ public abstract class SubCommand {
         /**
          * Constructor
          *
-         * @param name
-         *            readable name
+         * @param name readable name
          */
         CommandCategory(final String name) {
             this.name = name;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Swap.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Swap.java
index afe29c2ec..9c7a874ee 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Swap.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Swap.java
@@ -21,9 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
@@ -32,6 +29,8 @@ import com.intellectualcrafters.plot.object.PlotSelection;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.SetBlockFast;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
 
 /**
  * Created 2014-08-01 for PlotSquared
@@ -74,8 +73,7 @@ public class Swap extends SubCommand {
                 PlayerFunctions.sendMessage(plr, C.NO_PERM_MERGE, plotid.toString());
                 return false;
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_ID);
             PlayerFunctions.sendMessage(plr, C.SWAP_SYNTAX);
             return false;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java
index b0953539c..7487451fe 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/TP.java
@@ -21,17 +21,16 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
 
 /**
  * @author Citymonstret
@@ -70,8 +69,7 @@ public class TP extends SubCommand {
             plotid = new PlotId(Integer.parseInt(id.split(";")[0]), Integer.parseInt(id.split(";")[1]));
             PlotMain.teleportPlayer(plr, plr.getLocation(), PlotHelper.getPlot(world, plotid));
             return true;
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             PlayerFunctions.sendMessage(plr, C.NOT_VALID_PLOT_ID);
         }
         return false;
@@ -86,8 +84,7 @@ public class TP extends SubCommand {
             }
             a = split[0];
         }
-        @SuppressWarnings("deprecation")
-        final Player player = Bukkit.getPlayer(a);
+        @SuppressWarnings("deprecation") final Player player = Bukkit.getPlayer(a);
         if (player != null) {
             final java.util.Set plotMainPlots = PlotMain.getPlots(world, player);
             final Plot[] plots = plotMainPlots.toArray(new Plot[plotMainPlots.size()]);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java
index e5d365b8b..e221ebe9c 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java
@@ -21,12 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
@@ -34,9 +28,13 @@ import com.intellectualcrafters.plot.events.PlayerPlotTrustedEvent;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 
-@SuppressWarnings("deprecation")
-public class Trusted extends SubCommand {
+import java.util.UUID;
+
+@SuppressWarnings("deprecation") public class Trusted extends SubCommand {
 
     public Trusted() {
         super(Command.TRUSTED, "Manage trusted users for a plot", "trusted {add|remove} {player}", CommandCategory.ACTIONS, true);
@@ -62,8 +60,7 @@ public class Trusted extends SubCommand {
             if (args[1].equalsIgnoreCase("*")) {
                 uuid = DBFunc.everyone;
 
-            }
-            else {
+            } else {
                 uuid = UUIDHandler.getUUID(args[1]);
             }
             if (!plot.trusted.contains(uuid)) {
@@ -88,15 +85,13 @@ public class Trusted extends SubCommand {
                 DBFunc.setTrusted(plr.getWorld().getName(), plot, Bukkit.getOfflinePlayer(args[1]));
                 final PlayerPlotTrustedEvent event = new PlayerPlotTrustedEvent(plr, plot, uuid, true);
                 Bukkit.getPluginManager().callEvent(event);
-            }
-            else {
+            } else {
                 PlayerFunctions.sendMessage(plr, C.ALREADY_ADDED);
                 return false;
             }
             PlayerFunctions.sendMessage(plr, C.TRUSTED_ADDED);
             return true;
-        }
-        else if (args[0].equalsIgnoreCase("remove")) {
+        } else if (args[0].equalsIgnoreCase("remove")) {
             if (args[1].equalsIgnoreCase("*")) {
                 final UUID uuid = DBFunc.everyone;
                 if (!plot.trusted.contains(uuid)) {
@@ -127,8 +122,7 @@ public class Trusted extends SubCommand {
             final PlayerPlotTrustedEvent event = new PlayerPlotTrustedEvent(plr, plot, uuid, false);
             Bukkit.getPluginManager().callEvent(event);
             PlayerFunctions.sendMessage(plr, C.TRUSTED_REMOVED);
-        }
-        else {
+        } else {
             PlayerFunctions.sendMessage(plr, C.TRUSTED_NEED_ARGUMENT);
             return true;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unban.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unban.java
index 19ef801e9..3ce6d2fd2 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unban.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unban.java
@@ -1,10 +1,9 @@
 package com.intellectualcrafters.plot.commands;
 
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.entity.Player;
 
 /**
  * Created 2014-11-09 for PlotSquared
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
index a531769bc..d85387c40 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
@@ -21,16 +21,14 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import net.milkbowl.vault.economy.Economy;
-
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
+import net.milkbowl.vault.economy.Economy;
+import org.bukkit.entity.Player;
 
 public class Unclaim extends SubCommand {
 
@@ -66,9 +64,14 @@ public class Unclaim extends SubCommand {
             if ((Math.abs(plot.id.x) <= Math.abs(Auto.lastPlot.x)) && (Math.abs(plot.id.y) <= Math.abs(Auto.lastPlot.y))) {
                 Auto.lastPlot = plot.id;
             }
+<<<<<<< HEAD
         }
         else {
             PlayerFunctions.sendMessage(plr, "Plot unclaim has been denied.");
+=======
+        } else {
+            PlayerFunctions.sendMessage(plr, "Plot removal has been denied.");
+>>>>>>> 73e92b834155ea9e458d7299ad78f4fd9b55aa66
         }
         PlayerFunctions.sendMessage(plr, C.UNCLAIM_SUCCESS);
         return true;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java
index e0c381b3f..fdd3389f3 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java
@@ -21,12 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
@@ -39,6 +33,11 @@ import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.SetBlockFast;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
 
 /**
  * Created 2014-08-01 for PlotSquared
@@ -97,7 +96,7 @@ public class Unlink extends SubCommand {
                 myplot.denied = plot.denied;
             }
             myplot.deny_entry = plot.deny_entry;
-            myplot.settings.setMerged(new boolean[] { false, false, false, false });
+            myplot.settings.setMerged(new boolean[]{false, false, false, false});
             DBFunc.setMerged(world.getName(), myplot, myplot.settings.getMerged());
         }
 
@@ -126,13 +125,11 @@ public class Unlink extends SubCommand {
             if (PlotHelper.canSetFast) {
                 SetBlockFast.update(plr);
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             // execute(final Player plr, final String... args) {
             try {
                 PlotMain.sendConsoleSenderMessage("Error on: " + getClass().getMethod("execute", Player.class, String[].class).toGenericString() + ":119, when trying to use \"SetBlockFast#update\"");
-            }
-            catch (final Exception ex) {
+            } catch (final Exception ex) {
                 ex.printStackTrace();
             }
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Visit.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
index f3647e772..462c4de26 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
@@ -21,16 +21,15 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 public class Visit extends SubCommand {
     public Visit() {
@@ -68,8 +67,7 @@ public class Visit extends SubCommand {
         int i;
         try {
             i = Integer.parseInt(args[1]);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return sendMessage(plr, C.NOT_VALID_NUMBER);
         }
         if ((i < 0) || (i >= plots.size())) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/list.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/list.java
index cd043ceba..33fb952ea 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/list.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/list.java
@@ -21,12 +21,6 @@
 
 package com.intellectualcrafters.plot.commands;
 
-import java.util.HashMap;
-import java.util.UUID;
-
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
@@ -34,6 +28,11 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.StringComparison;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import java.util.HashMap;
+import java.util.UUID;
 
 /**
  * @author Citymonstret
@@ -61,10 +60,9 @@ public class list extends SubCommand {
             final StringBuilder builder = new StringBuilder();
             builder.append(C.SUBCOMMAND_SET_OPTIONS_HEADER.s());
             if (plr != null) {
-                builder.append(getArgumentList(new String[] { "mine", "shared", "world", "all" }));
-            }
-            else {
-                builder.append(getArgumentList(new String[] { "all" }));
+                builder.append(getArgumentList(new String[]{"mine", "shared", "world", "all"}));
+            } else {
+                builder.append(getArgumentList(new String[]{"all"}));
             }
             PlayerFunctions.sendMessage(plr, builder.toString());
             return true;
@@ -84,8 +82,7 @@ public class list extends SubCommand {
             string.append(C.PLOT_LIST_FOOTER.s().replaceAll("%word%", "You have").replaceAll("%num%", idx + "").replaceAll("%plot%", idx == 1 ? "plot" : "plots"));
             PlayerFunctions.sendMessage(plr, string.toString());
             return true;
-        }
-        else if (args[0].equalsIgnoreCase("shared") && (plr != null)) {
+        } else if (args[0].equalsIgnoreCase("shared") && (plr != null)) {
             final StringBuilder string = new StringBuilder();
             string.append(C.PLOT_LIST_HEADER.s().replaceAll("%word%", "all")).append("\n");
             for (final Plot p : PlotMain.getPlotsSorted()) {
@@ -96,8 +93,7 @@ public class list extends SubCommand {
             string.append(C.PLOT_LIST_FOOTER.s().replaceAll("%word%", "There are").replaceAll("%num%", PlotMain.getPlotsSorted().size() + "").replaceAll("%plot%", PlotMain.getPlotsSorted().size() == 1 ? "plot" : "plots"));
             PlayerFunctions.sendMessage(plr, string.toString());
             return true;
-        }
-        else if (args[0].equalsIgnoreCase("all")) {
+        } else if (args[0].equalsIgnoreCase("all")) {
             // Current page
             int page = 0;
 
@@ -109,8 +105,7 @@ public class list extends SubCommand {
                     if (page < 0) {
                         page = 0;
                     }
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     page = 0;
                 }
             }
@@ -145,8 +140,7 @@ public class list extends SubCommand {
             string.append(C.PLOT_LIST_FOOTER.s().replaceAll("%word%", "There is").replaceAll("%num%", PlotMain.getPlotsSorted().size() + "").replaceAll("%plot%", PlotMain.getPlotsSorted().size() == 1 ? "plot" : "plots"));
             PlayerFunctions.sendMessage(plr, string.toString());
             return true;
-        }
-        else if (args[0].equalsIgnoreCase("world") && (plr != null)) {
+        } else if (args[0].equalsIgnoreCase("world") && (plr != null)) {
             final StringBuilder string = new StringBuilder();
             string.append(C.PLOT_LIST_HEADER.s().replaceAll("%word%", "all")).append("\n");
             final HashMap plots = PlotMain.getPlots(plr.getWorld());
@@ -156,10 +150,9 @@ public class list extends SubCommand {
             string.append(C.PLOT_LIST_FOOTER.s().replaceAll("%word%", "There is").replaceAll("%num%", plots.values().size() + "").replaceAll("%plot%", plots.values().size() == 1 ? "plot" : "plots"));
             PlayerFunctions.sendMessage(plr, string.toString());
             return true;
-        }
-        else {
+        } else {
             // execute(plr);
-            sendMessage(plr, C.DID_YOU_MEAN, new StringComparison(args[0], new String[] { "mine", "shared", "world", "all" }).getBestMatch());
+            sendMessage(plr, C.DID_YOU_MEAN, new StringComparison(args[0], new String[]{"mine", "shared", "world", "all"}).getBestMatch());
             return false;
         }
     }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/plugin.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/plugin.java
index 93424882f..61c2a412a 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/plugin.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/plugin.java
@@ -21,19 +21,18 @@
 
 package com.intellectualcrafters.plot.commands;
 
+import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-
 public class plugin extends SubCommand {
 
     public static String downloads, version;
@@ -48,8 +47,7 @@ public class plugin extends SubCommand {
             public void run() {
                 try {
                     downloads = convertToNumericString(getInfo("https://intellectualsites.com/spigot_api.php?method=downloads&url=http://www.spigotmc.org/resources/plotsquared.1177/"), false);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     downloads = "unknown";
                 }
             }
@@ -59,8 +57,7 @@ public class plugin extends SubCommand {
             public void run() {
                 try {
                     version = convertToNumericString(getInfo("https://intellectualsites.com/spigot_api.php?method=version&resource=1177"), true);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     // Let's just ignore this, most likely error 500...
                     version = "unknown";
                 }
@@ -73,8 +70,7 @@ public class plugin extends SubCommand {
         for (final char c : str.toCharArray()) {
             if (Character.isDigit(c)) {
                 builder.append(c);
-            }
-            else if (dividers && ((c == ',') || (c == '.') || (c == '-') || (c == '_'))) {
+            } else if (dividers && ((c == ',') || (c == '.') || (c == '-') || (c == '_'))) {
                 builder.append(c);
             }
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
index 200c0792e..400eb9501 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
@@ -21,15 +21,10 @@
 
 package com.intellectualcrafters.plot.config;
 
-import org.bukkit.ChatColor;
-
 import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualsites.translation.TranslationFile;
-import com.intellectualsites.translation.TranslationLanguage;
-import com.intellectualsites.translation.TranslationManager;
-import com.intellectualsites.translation.TranslationObject;
-import com.intellectualsites.translation.YamlTranslationFile;
+import com.intellectualsites.translation.*;
 import com.intellectualsites.translation.bukkit.BukkitTranslation;
+import org.bukkit.ChatColor;
 
 /**
  * Captions class.
@@ -394,24 +389,24 @@ public enum C {
      *
      * @see com.intellectualsites.translation.TranslationManager
      */
-    private static TranslationManager          manager;
+    private static TranslationManager manager;
 
     /**
      * The default file
      *
      * @see com.intellectualsites.translation.TranslationFile
      */
-    private static TranslationFile             defaultFile;
+    private static TranslationFile defaultFile;
 
     /**
      * Default
      */
-    private String                             d;
+    private String d;
 
     /**
      * Translated
      */
-    private String                             s;
+    private String s;
 
     /**
      * Constructor for custom strings.
@@ -426,8 +421,7 @@ public enum C {
     /**
      * Constructor
      *
-     * @param d
-     *            default
+     * @param d default
      */
     C(final String d) {
         this.d = d;
@@ -486,6 +480,7 @@ public enum C {
 
     /**
      * @return translated and color decoded
+     *
      * @see org.bukkit.ChatColor#translateAlternateColorCodes(char, String)
      */
     public String translated() {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Configuration.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
index 4df60d037..3af8368d5 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
@@ -21,22 +21,20 @@
 
 package com.intellectualcrafters.plot.config;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.intellectualcrafters.plot.object.PlotBlock;
 import org.bukkit.block.Biome;
 
-import com.intellectualcrafters.plot.object.PlotBlock;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Main Configuration Utility
  *
  * @author Empire92
  */
-@SuppressWarnings("unused")
-public class Configuration {
+@SuppressWarnings("unused") public class Configuration {
 
-    public static final SettingValue STRING     = new SettingValue("STRING") {
+    public static final SettingValue STRING = new SettingValue("STRING") {
         @Override
         public boolean validateValue(final String string) {
             return true;
@@ -60,14 +58,13 @@ public class Configuration {
         }
     };
 
-    public static final SettingValue INTEGER    = new SettingValue("INTEGER") {
+    public static final SettingValue INTEGER = new SettingValue("INTEGER") {
         @Override
         public boolean validateValue(final String string) {
             try {
                 Integer.parseInt(string);
                 return true;
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 return false;
             }
         }
@@ -78,14 +75,13 @@ public class Configuration {
         }
     };
 
-    public static final SettingValue BOOLEAN    = new SettingValue("BOOLEAN") {
+    public static final SettingValue BOOLEAN = new SettingValue("BOOLEAN") {
         @Override
         public boolean validateValue(final String string) {
             try {
                 Boolean.parseBoolean(string);
                 return true;
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 return false;
             }
         }
@@ -96,14 +92,13 @@ public class Configuration {
         }
     };
 
-    public static final SettingValue DOUBLE     = new SettingValue("DOUBLE") {
+    public static final SettingValue DOUBLE = new SettingValue("DOUBLE") {
         @Override
         public boolean validateValue(final String string) {
             try {
                 Double.parseDouble(string);
                 return true;
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 return false;
             }
         }
@@ -114,14 +109,13 @@ public class Configuration {
         }
     };
 
-    public static final SettingValue BIOME      = new SettingValue("BIOME") {
+    public static final SettingValue BIOME = new SettingValue("BIOME") {
         @Override
         public boolean validateValue(final String string) {
             try {
                 Biome.valueOf(string.toUpperCase());
                 return true;
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 return false;
             }
         }
@@ -142,7 +136,7 @@ public class Configuration {
         }
     };
 
-    public static final SettingValue BLOCK      = new SettingValue("BLOCK") {
+    public static final SettingValue BLOCK = new SettingValue("BLOCK") {
         @Override
         public boolean validateValue(final String string) {
             try {
@@ -150,13 +144,11 @@ public class Configuration {
                     final String[] split = string.split(":");
                     Short.parseShort(split[0]);
                     Short.parseShort(split[1]);
-                }
-                else {
+                } else {
                     Short.parseShort(string);
                 }
                 return true;
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 return false;
             }
         }
@@ -166,8 +158,7 @@ public class Configuration {
             if (string.contains(":")) {
                 final String[] split = string.split(":");
                 return new PlotBlock(Short.parseShort(split[0]), Byte.parseByte(split[1]));
-            }
-            else {
+            } else {
                 return new PlotBlock(Short.parseShort(string), (byte) 0);
             }
         }
@@ -177,7 +168,7 @@ public class Configuration {
             return ((PlotBlock) object).id + ":" + ((PlotBlock) object).data;
         }
     };
-    public static final SettingValue BLOCKLIST  = new SettingValue("BLOCKLIST") {
+    public static final SettingValue BLOCKLIST = new SettingValue("BLOCKLIST") {
         @Override
         public boolean validateValue(final String string) {
             try {
@@ -191,14 +182,12 @@ public class Configuration {
                         final String[] split = block.split(":");
                         Short.parseShort(split[0]);
                         Short.parseShort(split[1]);
-                    }
-                    else {
+                    } else {
                         Short.parseShort(block);
                     }
                 }
                 return true;
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 return false;
             }
         }
@@ -220,8 +209,7 @@ public class Configuration {
                     if (value < min) {
                         min = value;
                     }
-                }
-                else {
+                } else {
                     counts[i] = 1;
                     if (1 < min) {
                         min = 1;
@@ -230,8 +218,7 @@ public class Configuration {
                 if (blocks[i].contains(":")) {
                     final String[] split = blocks[i].split(":");
                     values[i] = new PlotBlock(Short.parseShort(split[0]), Byte.parseByte(split[1]));
-                }
-                else {
+                } else {
                     values[i] = new PlotBlock(Short.parseShort(blocks[i]), (byte) 0);
                 }
             }
@@ -272,8 +259,7 @@ public class Configuration {
     }
 
     /**
-     * Create your own SettingValue object to make the management of plotworld
-     * configuration easier
+     * Create your own SettingValue object to make the management of plotworld configuration easier
      */
     public static abstract class SettingValue {
         private final String type;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java
index 787693a12..0f79f2d0e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java
@@ -21,11 +21,10 @@
 
 package com.intellectualcrafters.plot.config;
 
-import java.util.Arrays;
-
+import com.intellectualcrafters.plot.config.Configuration.SettingValue;
 import org.apache.commons.lang.StringUtils;
 
-import com.intellectualcrafters.plot.config.Configuration.SettingValue;
+import java.util.Arrays;
 
 /**
  * Configuration Node
@@ -33,11 +32,11 @@ import com.intellectualcrafters.plot.config.Configuration.SettingValue;
  * @author Empire92
  */
 public class ConfigurationNode {
-    private final String       constant;
-    private final Object       default_value;
-    private final String       description;
+    private final String constant;
+    private final Object default_value;
+    private final String description;
     private final SettingValue type;
-    private Object             value;
+    private Object value;
 
     public ConfigurationNode(final String constant, final Object default_value, final String description, final SettingValue type, final boolean required) {
         this.constant = constant;
@@ -55,8 +54,7 @@ public class ConfigurationNode {
         try {
             final Object result = this.type.parseString(string);
             return result != null;
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return false;
         }
     }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Settings.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Settings.java
index 45c666af8..1eb39bd94 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Settings.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/Settings.java
@@ -31,97 +31,97 @@ public class Settings {
     /**
      *
      */
-    public static int           MAX_AUTO_SIZE               = 4;
+    public static int MAX_AUTO_SIZE = 4;
     /**
      * Default worldedit-require-selection-in-mask: false
      */
-    public static boolean       REQUIRE_SELECTION           = true;
+    public static boolean REQUIRE_SELECTION = true;
     /**
      * Default kill road mobs: true
      */
-    public final static boolean KILL_ROAD_MOBS_DEFAULT      = true;
+    public final static boolean KILL_ROAD_MOBS_DEFAULT = true;
     /**
      * Default mob pathfinding: true
      */
-    public final static boolean MOB_PATHFINDING_DEFAULT     = true;
+    public final static boolean MOB_PATHFINDING_DEFAULT = true;
     /**
      * Teleport to path on login
      */
-    public static boolean       TELEPORT_ON_LOGIN           = false;
+    public static boolean TELEPORT_ON_LOGIN = false;
     /**
      * Mob Cap Enabled
      */
-    public static boolean       MOB_CAP_ENABLED             = false;
+    public static boolean MOB_CAP_ENABLED = false;
     /**
      * The Mob Cap
      */
-    public static int           MOB_CAP                     = 20;
+    public static int MOB_CAP = 20;
     /**
      * Display titles
      */
-    public static boolean       TITLES                      = true;
+    public static boolean TITLES = true;
     /**
      * Schematic Save Path
      */
-    public static String        SCHEMATIC_SAVE_PATH         = "/var/www/schematics";
+    public static String SCHEMATIC_SAVE_PATH = "/var/www/schematics";
     /**
      * Max allowed plots
      */
-    public static int           MAX_PLOTS                   = 20;
+    public static int MAX_PLOTS = 20;
     /**
      * WorldGuard region on claimed plots
      */
-    public static boolean       WORLDGUARD                  = false;
+    public static boolean WORLDGUARD = false;
     /**
      * metrics
      */
-    public static boolean       METRICS                     = true;
+    public static boolean METRICS = true;
     /**
      * plot specific resource pack
      */
-    public static String        PLOT_SPECIFIC_RESOURCE_PACK = "";
+    public static String PLOT_SPECIFIC_RESOURCE_PACK = "";
     /**
      * Kill road mobs?
      */
-    public static boolean       KILL_ROAD_MOBS;
+    public static boolean KILL_ROAD_MOBS;
     /**
      * mob pathfinding?
      */
-    public static boolean       MOB_PATHFINDING;
+    public static boolean MOB_PATHFINDING;
     /**
      * Delete plots on ban?
      */
-    public static boolean       DELETE_PLOTS_ON_BAN         = false;
+    public static boolean DELETE_PLOTS_ON_BAN = false;
 
     /**
      * Verbose?
      */
-    public static boolean       DEBUG                       = true;
+    public static boolean DEBUG = true;
 
     /**
      * Auto clear enabled
      */
-    public static boolean       AUTO_CLEAR                  = false;
+    public static boolean AUTO_CLEAR = false;
 
     /**
      * Days until a plot gets cleared
      */
-    public static int           AUTO_CLEAR_DAYS             = 365;
+    public static int AUTO_CLEAR_DAYS = 365;
 
     /**
      * API Location
      */
-    public static String        API_URL                     = "http://www.intellectualsites.com/minecraft.php";
+    public static String API_URL = "http://www.intellectualsites.com/minecraft.php";
 
     /**
      * Use the custom API
      */
-    public static boolean       CUSTOM_API                  = true;
+    public static boolean CUSTOM_API = true;
 
     /**
      * Use offline mode storage
      */
-    public static boolean       OFFLINE_MODE                = false;
+    public static boolean OFFLINE_MODE = false;
 
     /**
      * Database settings
@@ -132,7 +132,7 @@ public class Settings {
         /**
          * MongoDB enabled?
          */
-        public static boolean USE_MONGO  = false;      /*
+        public static boolean USE_MONGO = false;      /*
          * TODO: Implement Mongo
          * @Brandon
          */
@@ -143,34 +143,34 @@ public class Settings {
         /**
          * MySQL Enabled?
          */
-        public static boolean USE_MYSQL  = true;       /* NOTE: Fixed connector */
+        public static boolean USE_MYSQL = true;       /* NOTE: Fixed connector */
         /**
          * SQLite Database name
          */
-        public static String  SQLITE_DB  = "storage";
+        public static String SQLITE_DB = "storage";
         /**
          * MySQL Host name
          */
-        public static String  HOST_NAME  = "localhost";
+        public static String HOST_NAME = "localhost";
         /**
          * MySQL Port
          */
-        public static String  PORT       = "3306";
+        public static String PORT = "3306";
         /**
          * MySQL DB
          */
-        public static String  DATABASE   = "plot_db";
+        public static String DATABASE = "plot_db";
         /**
          * MySQL User
          */
-        public static String  USER       = "root";
+        public static String USER = "root";
         /**
          * MySQL Password
          */
-        public static String  PASSWORD   = "password";
+        public static String PASSWORD = "password";
         /**
          * MySQL Prefix
          */
-        public static String  PREFIX     = "";
+        public static String PREFIX = "";
     }
 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java
index 7d7df55d1..c1e311560 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java
@@ -21,19 +21,18 @@
 
 package com.intellectualcrafters.plot.database;
 
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotComment;
+import com.intellectualcrafters.plot.object.PlotId;
+import org.bukkit.OfflinePlayer;
+
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.UUID;
 
-import org.bukkit.OfflinePlayer;
-
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotComment;
-import com.intellectualcrafters.plot.object.PlotId;
-
 /**
  * @author Citymonstret
  * @author Empire92
@@ -50,73 +49,62 @@ public interface AbstractDB {
     /**
      * Set Plot owner
      *
-     * @param plot
-     *            Plot in which the owner should be set
-     * @param uuid
-     *            The uuid of the new owner
+     * @param plot Plot in which the owner should be set
+     * @param uuid The uuid of the new owner
      */
     public void setOwner(final Plot plot, final UUID uuid);
 
     /**
      * Create all settings, and create default helpers, trusted + denied lists
      *
-     * @param plots
-     *            Plots for which the default table entries should be created
+     * @param plots Plots for which the default table entries should be created
      */
     public void createAllSettingsAndHelpers(final ArrayList plots);
 
     /**
      * Create a plot
      *
-     * @param plots
-     *            Plots that should be created
+     * @param plots Plots that should be created
      */
     public void createPlots(final ArrayList plots);
 
     /**
      * Create a plot
      *
-     * @param plot
-     *            That should be created
+     * @param plot That should be created
      */
     public void createPlot(final Plot plot);
 
     /**
      * Create tables
      *
-     * @param database
-     *            Database in which the tables will be created
+     * @param database Database in which the tables will be created
      *
-     * @throws SQLException
-     *             If the database manager is unable to create the tables
+     * @throws SQLException If the database manager is unable to create the tables
      */
     public void createTables(final String database, final boolean add_constraint) throws Exception;
 
     /**
      * Delete a plot
      *
-     * @param plot
-     *            Plot that should be deleted
+     * @param plot Plot that should be deleted
      */
     public void delete(final String world, final Plot plot);
 
     /**
      * Create plot settings
      *
-     * @param id
-     *            Plot Entry ID
-     * @param plot
-     *            Plot Object
+     * @param id   Plot Entry ID
+     * @param plot Plot Object
      */
     public void createPlotSettings(final int id, final Plot plot);
 
     /**
      * Get the table entry ID
      *
-     * @param world
-     *            Which the plot is located in
-     * @param id2
-     *            Plot ID
+     * @param world Which the plot is located in
+     * @param id2   Plot ID
+     *
      * @return Integer = Plot Entry Id
      */
     public int getId(final String world, final PlotId id2);
@@ -129,125 +117,100 @@ public interface AbstractDB {
     /**
      * Set the merged status for a plot
      *
-     * @param world
-     *            World in which the plot is located
-     * @param plot
-     *            Plot Object
-     * @param merged
-     *            boolean[]
+     * @param world  World in which the plot is located
+     * @param plot   Plot Object
+     * @param merged boolean[]
      */
     public void setMerged(final String world, final Plot plot, final boolean[] merged);
 
     /**
      * Set plot flags
      *
-     * @param world
-     *            World in which the plot is located
-     * @param plot
-     *            Plot Object
-     * @param flags
-     *            flags to set (flag[])
+     * @param world World in which the plot is located
+     * @param plot  Plot Object
+     * @param flags flags to set (flag[])
      */
     public void setFlags(final String world, final Plot plot, final Flag[] flags);
 
     /**
      * Set the plot alias
      *
-     * @param plot
-     *            Plot for which the alias should be set
-     * @param alias
-     *            Plot Alias
+     * @param plot  Plot for which the alias should be set
+     * @param alias Plot Alias
      */
     public void setAlias(final String world, final Plot plot, final String alias);
 
     /**
      * Purgle a plot
      *
-     * @param world
-     *            World in which the plot is located
-     * @param id
-     *            Plot ID
+     * @param world World in which the plot is located
+     * @param id    Plot ID
      */
     public void purge(final String world, final PlotId id);
 
     /**
      * Purge a whole world
      *
-     * @param world
-     *            World in which the plots should be purged
+     * @param world World in which the plots should be purged
      */
     public void purge(final String world);
 
     /**
      * Set Plot Home Position
      *
-     * @param plot
-     *            Plot Object
-     * @param position
-     *            Plot Home Position
+     * @param plot     Plot Object
+     * @param position Plot Home Position
      */
     public void setPosition(final String world, final Plot plot, final String position);
 
     /**
-     * @param id
-     *            Plot Entry ID
+     * @param id Plot Entry ID
+     *
      * @return Plot Settings
      */
     public HashMap getSettings(final int id);
 
     /**
-     * @param plot
-     *            Plot Object
-     * @param player
-     *            Player that should be removed
+     * @param plot   Plot Object
+     * @param player Player that should be removed
      */
     public void removeHelper(final String world, final Plot plot, final OfflinePlayer player);
 
     /**
-     * @param plot
-     *            Plot Object
-     * @param player
-     *            Player that should be removed
+     * @param plot   Plot Object
+     * @param player Player that should be removed
      */
     public void removeTrusted(final String world, final Plot plot, final OfflinePlayer player);
 
     /**
-     * @param plot
-     *            Plot Object
-     * @param player
-     *            Player that should be removed
+     * @param plot   Plot Object
+     * @param player Player that should be removed
      */
     public void setHelper(final String world, final Plot plot, final OfflinePlayer player);
 
     /**
-     * @param plot
-     *            Plot Object
-     * @param player
-     *            Player that should be added
+     * @param plot   Plot Object
+     * @param player Player that should be added
      */
     public void setTrusted(final String world, final Plot plot, final OfflinePlayer player);
 
     /**
-     * @param plot
-     *            Plot Object
-     * @param player
-     *            Player that should be added
+     * @param plot   Plot Object
+     * @param player Player that should be added
      */
     public void removeDenied(final String world, final Plot plot, final OfflinePlayer player);
 
     /**
-     * @param plot
-     *            Plot Object
-     * @param player
-     *            Player that should be added
+     * @param plot   Plot Object
+     * @param player Player that should be added
      */
     public void setDenied(final String world, final Plot plot, final OfflinePlayer player);
 
     /**
      * Get Plots ratings
      *
-     * @param plot
-     *            Plot Object
+     * @param plot Plot Object
+     *
      * @return Plot Ratings (pre-calculated)
      */
     public double getRatings(final Plot plot);
@@ -255,36 +218,28 @@ public interface AbstractDB {
     /**
      * Remove a plot comment
      *
-     * @param world
-     *            World in which the plot is located
-     * @param plot
-     *            Plot Object
-     * @param comment
-     *            Comment to remove
+     * @param world   World in which the plot is located
+     * @param plot    Plot Object
+     * @param comment Comment to remove
      */
     public void removeComment(final String world, final Plot plot, final PlotComment comment);
 
     /**
      * Set a plot comment
      *
-     * @param world
-     *            World in which the plot is located
-     * @param plot
-     *            Plot Object
-     * @param comment
-     *            Comment to add
+     * @param world   World in which the plot is located
+     * @param plot    Plot Object
+     * @param comment Comment to add
      */
     public void setComment(final String world, final Plot plot, final PlotComment comment);
 
     /**
      * Get Plot Comments
      *
-     * @param world
-     *            World in which the plot is located
-     * @param plot
-     *            Plot Object
-     * @param tier
-     *            Comment Tier
+     * @param world World in which the plot is located
+     * @param plot  Plot Object
+     * @param tier  Comment Tier
+     *
      * @return Plot Comments within the specified tier
      */
     public ArrayList getComments(final String world, final Plot plot, final int tier);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
index 0153f590f..a211561f7 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
@@ -21,17 +21,16 @@
 
 package com.intellectualcrafters.plot.database;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.UUID;
-
-import org.bukkit.OfflinePlayer;
-
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotComment;
 import com.intellectualcrafters.plot.object.PlotId;
+import org.bukkit.OfflinePlayer;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.UUID;
 
 /**
  * DB Functions
@@ -53,10 +52,8 @@ public class DBFunc {
     /**
      * Set the owner of a plot
      *
-     * @param plot
-     *            Plot Object
-     * @param uuid
-     *            New Owner
+     * @param plot Plot Object
+     * @param uuid New Owner
      */
     public static void setOwner(final Plot plot, final UUID uuid) {
         dbManager.setOwner(plot, uuid);
@@ -65,8 +62,7 @@ public class DBFunc {
     /**
      * Create all settings + (helpers, denied, trusted)
      *
-     * @param plots
-     *            List containing all plot objects
+     * @param plots List containing all plot objects
      */
     public static void createAllSettingsAndHelpers(final ArrayList plots) {
         dbManager.createAllSettingsAndHelpers(plots);
@@ -75,8 +71,7 @@ public class DBFunc {
     /**
      * Create all plots
      *
-     * @param plots
-     *            A list containing plot objects
+     * @param plots A list containing plot objects
      */
     public static void createPlots(final ArrayList plots) {
         dbManager.createPlots(plots);
@@ -85,8 +80,7 @@ public class DBFunc {
     /**
      * Create a plot
      *
-     * @param plot
-     *            Plot to create
+     * @param plot Plot to create
      */
     public static void createPlot(final Plot plot) {
         dbManager.createPlot(plot);
@@ -104,8 +98,7 @@ public class DBFunc {
     /**
      * Delete a plot
      *
-     * @param plot
-     *            Plot to delete
+     * @param plot Plot to delete
      */
     public static void delete(final String world, final Plot plot) {
         dbManager.delete(world, plot);
@@ -114,10 +107,8 @@ public class DBFunc {
     /**
      * Create plot settings
      *
-     * @param id
-     *            Plot ID
-     * @param plot
-     *            Plot Object
+     * @param id   Plot ID
+     * @param plot Plot Object
      */
     public static void createPlotSettings(final int id, final Plot plot) {
         dbManager.createPlotSettings(id, plot);
@@ -126,10 +117,9 @@ public class DBFunc {
     /**
      * Get a plot id
      *
-     * @param world
-     *            World
-     * @param id2
-     *            Plot ID
+     * @param world World
+     * @param id2   Plot ID
+     *
      * @return ID
      */
     /*
@@ -187,6 +177,7 @@ public class DBFunc {
 
     /**
      * @param id
+     *
      * @return
      */
     public static HashMap getSettings(final int id) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/Database.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/Database.java
index f593837e7..3899ed529 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/Database.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/Database.java
@@ -21,15 +21,14 @@
 
 package com.intellectualcrafters.plot.database;
 
+import org.bukkit.plugin.Plugin;
+
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.bukkit.plugin.Plugin;
-
 /**
- * Abstract Database class, serves as a base for any connection method (MySQL,
- * SQLite, etc.)
+ * Abstract Database class, serves as a base for any connection method (MySQL, SQLite, etc.)
  *
  * @author -_Husky_-
  * @author tips48
@@ -44,8 +43,7 @@ public abstract class Database {
     /**
      * Creates a new Database
      *
-     * @param plugin
-     *            Plugin instance
+     * @param plugin Plugin instance
      */
     protected Database(final Plugin plugin) {
         this.plugin = plugin;
@@ -55,10 +53,9 @@ public abstract class Database {
      * Opens a connection with the database
      *
      * @return Opened connection
-     * @throws SQLException
-     *             if the connection can not be opened
-     * @throws ClassNotFoundException
-     *             if the driver cannot be found
+     *
+     * @throws SQLException           if the connection can not be opened
+     * @throws ClassNotFoundException if the driver cannot be found
      */
     public abstract Connection openConnection() throws SQLException, ClassNotFoundException;
 
@@ -66,8 +63,8 @@ public abstract class Database {
      * Checks if a connection is open with the database
      *
      * @return true if the connection is open
-     * @throws SQLException
-     *             if the connection cannot be checked
+     *
+     * @throws SQLException if the connection cannot be checked
      */
     public abstract boolean checkConnection() throws SQLException;
 
@@ -82,37 +79,33 @@ public abstract class Database {
      * Closes the connection with the database
      *
      * @return true if successful
-     * @throws SQLException
-     *             if the connection cannot be closed
+     *
+     * @throws SQLException if the connection cannot be closed
      */
     public abstract boolean closeConnection() throws SQLException;
 
     /**
-     * Executes a SQL Query

-     * If the connection is closed, it will be opened
+     * Executes a SQL Query
 If the connection is closed, it will be opened
+     *
+     * @param query Query to be run
      *
-     * @param query
-     *            Query to be run
      * @return the results of the query
-     * @throws SQLException
-     *             If the query cannot be executed
-     * @throws ClassNotFoundException
-     *             If the driver cannot be found; see {@link #openConnection()}
+     *
+     * @throws SQLException           If the query cannot be executed
+     * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
      */
     public abstract ResultSet querySQL(final String query) throws SQLException, ClassNotFoundException;
 
     /**
-     * Executes an Update SQL Query

-     * See {@link java.sql.Statement#executeUpdate(String)}

-     * If the connection is closed, it will be opened
+     * Executes an Update SQL Query
 See {@link java.sql.Statement#executeUpdate(String)}
 If the connection is
+     * closed, it will be opened
+     *
+     * @param query Query to be run
      *
-     * @param query
-     *            Query to be run
      * @return Result Code, see {@link java.sql.Statement#executeUpdate(String)}
-     * @throws SQLException
-     *             If the query cannot be executed
-     * @throws ClassNotFoundException
-     *             If the driver cannot be found; see {@link #openConnection()}
+     *
+     * @throws SQLException           If the query cannot be executed
+     * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
      */
     public abstract int updateSQL(final String query) throws SQLException, ClassNotFoundException;
 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/MySQL.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/MySQL.java
index f50312f11..a8afdfad1 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/MySQL.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/MySQL.java
@@ -21,14 +21,10 @@
 
 package com.intellectualcrafters.plot.database;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
 import org.bukkit.plugin.Plugin;
 
+import java.sql.*;
+
 /**
  * Connects to and uses a MySQL database
  *
@@ -42,23 +38,17 @@ public class MySQL extends Database {
     private final String port;
     private final String hostname;
 
-    private Connection   connection;
+    private Connection connection;
 
     /**
      * Creates a new MySQL instance
      *
-     * @param plugin
-     *            Plugin instance
-     * @param hostname
-     *            Name of the host
-     * @param port
-     *            Port number
-     * @param database
-     *            Database name
-     * @param username
-     *            Username
-     * @param password
-     *            Password
+     * @param plugin   Plugin instance
+     * @param hostname Name of the host
+     * @param port     Port number
+     * @param database Database name
+     * @param username Username
+     * @param password Password
      */
     public MySQL(final Plugin plugin, final String hostname, final String port, final String database, final String username, final String password) {
         super(plugin);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
index 6930d6a5a..590ee9e82 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
@@ -21,22 +21,6 @@
 
 package com.intellectualcrafters.plot.database;
 
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.WorldCreator;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.plugin.Plugin;
-
 import com.google.common.base.Charsets;
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.Settings;
@@ -46,6 +30,15 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.worldcretornica.plotme.PlayerList;
 import com.worldcretornica.plotme.Plot;
 import com.worldcretornica.plotme.PlotManager;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.WorldCreator;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.plugin.Plugin;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.*;
 
 /**
  * Created 2014-08-17 for PlotSquared
@@ -63,8 +56,7 @@ public class PlotMeConverter {
     /**
      * Constructor
      *
-     * @param plugin
-     *            Plugin Used to run the converter
+     * @param plugin Plugin Used to run the converter
      */
     public PlotMeConverter(final PlotMain plugin) {
         this.plugin = plugin;
@@ -127,8 +119,7 @@ public class PlotMeConverter {
 
                             final Boolean auto_link = plotConfig.getBoolean("worlds." + world.getName() + ".AutoLinkPlots"); //
                             PlotMain.config.set("worlds." + world.getName() + ".plot.auto_merge", auto_link);
-                        }
-                        catch (final Exception e) {
+                        } catch (final Exception e) {
                             sendMessage("&c-- &lFailed to save configuration for world '" + world.getName() + "'\nThis will need to be done using the setup command, or manually");
                         }
 
@@ -173,13 +164,11 @@ public class PlotMeConverter {
                                             psDenied.add(set.getValue());
                                         }
                                     }
-                                }
-                                else {
+                                } else {
                                     for (final String user : plot.getAllowed().split(",")) {
                                         if (user.equals("*")) {
                                             psAdded.add(DBFunc.everyone);
-                                        }
-                                        else {
+                                        } else {
                                             final UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + user).getBytes(Charsets.UTF_8));
                                             psAdded.add(uuid);
                                         }
@@ -188,19 +177,16 @@ public class PlotMeConverter {
                                         for (final String user : plot.getDenied().split(",")) {
                                             if (user.equals("*")) {
                                                 psDenied.add(DBFunc.everyone);
-                                            }
-                                            else {
+                                            } else {
                                                 final UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + user).getBytes(Charsets.UTF_8));
                                                 psDenied.add(uuid);
                                             }
                                         }
-                                    }
-                                    catch (final Throwable e) {
+                                    } catch (final Throwable e) {
                                         // Okay, this is evil.
                                     }
                                 }
-                            }
-                            catch (final Throwable e) {
+                            } catch (final Throwable e) {
                                 e.printStackTrace();
                             }
                             final PlotId id = new PlotId(Integer.parseInt(plot.id.split(";")[0]), Integer.parseInt(plot.id.split(";")[1]));
@@ -208,20 +194,18 @@ public class PlotMeConverter {
                             if (online) {
                                 pl = new com.intellectualcrafters.plot.object.Plot(id, plot.getOwnerId(), psAdded, psTrusted, psDenied,
 
-                                        "", PlotHomePosition.DEFAULT, null, world.getName(), new boolean[] { false, false, false, false });
-                            }
-                            else {
+                                                                                          "", PlotHomePosition.DEFAULT, null, world.getName(), new boolean[]{false, false, false, false});
+                            } else {
                                 final String owner = plot.getOwner();
                                 pl = new com.intellectualcrafters.plot.object.Plot(id, UUID.nameUUIDFromBytes(("OfflinePlayer:" + owner).getBytes(Charsets.UTF_8)), psAdded, psTrusted, psDenied,
 
-                                        "", PlotHomePosition.DEFAULT, null, world.getName(), new boolean[] { false, false, false, false });
+                                                                                          "", PlotHomePosition.DEFAULT, null, world.getName(), new boolean[]{false, false, false, false});
                             }
 
                             if (pl != null) {
                                 if (!PlotMain.getPlots(world).containsKey(id)) {
                                     createdPlots.add(pl);
-                                }
-                                else {
+                                } else {
                                     duplicate++;
                                 }
                             }
@@ -240,8 +224,7 @@ public class PlotMeConverter {
                 PlotMain.sendConsoleSenderMessage("&3PlotMe&8->&3PlotSquared&8:&7 Saving configuration...");
                 try {
                     PlotMain.config.save(PlotMain.configFile);
-                }
-                catch (final IOException e) {
+                } catch (final IOException e) {
                     PlotMain.sendConsoleSenderMessage(" - &cFailed to save configuration.");
                 }
 
@@ -250,8 +233,7 @@ public class PlotMeConverter {
 
                 if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
                     MV = true;
-                }
-                else if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
+                } else if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
                     MW = true;
                 }
 
@@ -266,26 +248,22 @@ public class PlotMeConverter {
                         Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv unload " + worldname);
                         try {
                             Thread.sleep(1000);
-                        }
-                        catch (final InterruptedException ex) {
+                        } catch (final InterruptedException ex) {
                             Thread.currentThread().interrupt();
                         }
                         // load
                         Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv import " + worldname + " normal -g PlotSquared");
-                    }
-                    else if (MW) {
+                    } else if (MW) {
                         // unload
                         Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw unload " + worldname);
                         try {
                             Thread.sleep(1000);
-                        }
-                        catch (final InterruptedException ex) {
+                        } catch (final InterruptedException ex) {
                             Thread.currentThread().interrupt();
                         }
                         // load
                         Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + worldname + " plugin:PlotSquared");
-                    }
-                    else {
+                    } else {
                         Bukkit.getServer().unloadWorld(world, true);
                         final World myworld = WorldCreator.name(worldname).generator(new WorldGenerator(worldname)).createWorld();
                         myworld.save();
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
index 6eb1bd407..5abe613a2 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
@@ -21,24 +21,6 @@
 
 package com.intellectualcrafters.plot.database;
 
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Set;
-import java.util.UUID;
-
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.block.Biome;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
@@ -49,6 +31,13 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.util.Logger;
 import com.intellectualcrafters.plot.util.Logger.LogLevel;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.block.Biome;
+
+import java.sql.*;
+import java.util.*;
 
 /**
  * @author Citymonstret
@@ -56,23 +45,21 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 public class SQLManager implements AbstractDB {
 
     // Public final
-    public final String  SET_OWNER;
-    public final String  GET_ALL_PLOTS;
-    public final String  CREATE_PLOTS;
-    public final String  CREATE_SETTINGS;
-    public final String  CREATE_HELPERS;
-    public final String  CREATE_PLOT;
+    public final String SET_OWNER;
+    public final String GET_ALL_PLOTS;
+    public final String CREATE_PLOTS;
+    public final String CREATE_SETTINGS;
+    public final String CREATE_HELPERS;
+    public final String CREATE_PLOT;
     // Private Final
-    private Connection   connection;
+    private Connection connection;
     private final String prefix;
 
     /**
      * Constructor
      *
-     * @param c
-     *            connection
-     * @param p
-     *            prefix
+     * @param c connection
+     * @param p prefix
      */
     public SQLManager(final Connection c, final String p) {
         // Private final
@@ -96,8 +83,7 @@ public class SQLManager implements AbstractDB {
                 public void run() {
                     try {
                         SQLManager.this.connection = PlotMain.getMySQL().forceConnection();
-                    }
-                    catch (final Exception e) {
+                    } catch (final Exception e) {
                         e.printStackTrace();
                     }
                 }
@@ -127,10 +113,8 @@ public class SQLManager implements AbstractDB {
     /**
      * Set Plot owner
      *
-     * @param plot
-     *            Plot Object
-     * @param uuid
-     *            Owner UUID
+     * @param plot Plot Object
+     * @param uuid Owner UUID
      */
     @Override
     public void setOwner(final Plot plot, final UUID uuid) {
@@ -144,8 +128,7 @@ public class SQLManager implements AbstractDB {
                     statement.setInt(3, plot.id.y);
                     statement.executeUpdate();
                     statement.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.DANGER, "Could not set owner for plot " + plot.id);
                 }
@@ -175,8 +158,7 @@ public class SQLManager implements AbstractDB {
                 }
                 stored.get(world).put(new PlotId(idx, idz), id);
             }
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             e.printStackTrace();
         }
 
@@ -209,8 +191,7 @@ public class SQLManager implements AbstractDB {
             }
             stmt.executeUpdate();
             stmt.close();
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             e.printStackTrace();
         }
 
@@ -239,8 +220,7 @@ public class SQLManager implements AbstractDB {
             }
             stmt.executeUpdate();
             stmt.close();
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             Logger.add(LogLevel.WARNING, "Failed to set helper for plots");
             e.printStackTrace();
         }
@@ -279,8 +259,7 @@ public class SQLManager implements AbstractDB {
             }
             stmt.executeUpdate();
             stmt.close();
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             e.printStackTrace();
             Logger.add(LogLevel.DANGER, "Failed to save plots!");
         }
@@ -302,8 +281,7 @@ public class SQLManager implements AbstractDB {
             stmt.setString(4, plot.world);
             stmt.executeUpdate();
             stmt.close();
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             e.printStackTrace();
             Logger.add(LogLevel.DANGER, "Failed to save plot " + plot.id);
         }
@@ -331,8 +309,7 @@ public class SQLManager implements AbstractDB {
                 stmt.addBatch("ALTER TABLE `" + this.prefix + "plot_settings` ADD CONSTRAINT `" + this.prefix + "plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `" + this.prefix + "plot` (`id`) ON DELETE CASCADE");
             }
 
-        }
-        else {
+        } else {
             stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` (" + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`plot_id_x` INT(11) NOT NULL," + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(45) NOT NULL," + "`world` VARCHAR(45) NOT NULL," + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
             stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_denied` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
             stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_helpers` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
@@ -379,8 +356,7 @@ public class SQLManager implements AbstractDB {
                     stmt.setInt(1, id);
                     stmt.executeUpdate();
                     stmt.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.DANGER, "Failed to delete plot " + plot.id);
                 }
@@ -405,8 +381,7 @@ public class SQLManager implements AbstractDB {
                     stmt.setInt(1, id);
                     stmt.executeUpdate();
                     stmt.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                 }
 
@@ -429,8 +404,7 @@ public class SQLManager implements AbstractDB {
             }
             stmt.close();
             return id;
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             e.printStackTrace();
         }
         return Integer.MAX_VALUE;
@@ -463,8 +437,7 @@ public class SQLManager implements AbstractDB {
                 statement.executeBatch();
                 statement.close();
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
         }
         final HashMap plots = new HashMap<>();
@@ -497,8 +470,7 @@ public class SQLManager implements AbstractDB {
                 if (!worlds.contains(worldname)) {
                     if (noExist.containsKey(worldname)) {
                         noExist.put(worldname, noExist.get(worldname) + 1);
-                    }
-                    else {
+                    } else {
                         noExist.put(worldname, 1);
                     }
                 }
@@ -508,7 +480,7 @@ public class SQLManager implements AbstractDB {
                     user = UUID.fromString(o);
                     uuids.put(o, user);
                 }
-                p = new Plot(plot_id, user, new ArrayList(), new ArrayList(), new ArrayList(), "", PlotHomePosition.DEFAULT, null, worldname, new boolean[] { false, false, false, false });
+                p = new Plot(plot_id, user, new ArrayList(), new ArrayList(), new ArrayList(), "", PlotHomePosition.DEFAULT, null, worldname, new boolean[]{false, false, false, false});
                 plots.put(id, p);
             }
             // stmt.close();
@@ -528,8 +500,7 @@ public class SQLManager implements AbstractDB {
                 final Plot plot = plots.get(id);
                 if (plot != null) {
                     plot.addHelper(user);
-                }
-                else {
+                } else {
                     PlotMain.sendConsoleSenderMessage("&cPLOT " + id + " in plot_helpers does not exist. Please create the plot or remove this entry.");
                 }
             }
@@ -551,8 +522,7 @@ public class SQLManager implements AbstractDB {
                 final Plot plot = plots.get(id);
                 if (plot != null) {
                     plot.addTrusted(user);
-                }
-                else {
+                } else {
                     PlotMain.sendConsoleSenderMessage("&cPLOT " + id + " in plot_trusted does not exist. Please create the plot or remove this entry.");
                 }
             }
@@ -574,8 +544,7 @@ public class SQLManager implements AbstractDB {
                 final Plot plot = plots.get(id);
                 if (plot != null) {
                     plot.addDenied(user);
-                }
-                else {
+                } else {
                     PlotMain.sendConsoleSenderMessage("&cPLOT " + id + " in plot_denied does not exist. Please create the plot or remove this entry.");
                 }
             }
@@ -620,17 +589,15 @@ public class SQLManager implements AbstractDB {
                             merged[3 - i] = ((m) & (1 << i)) != 0;
                         }
                         plot.settings.setMerged(merged);
-                    }
-                    else {
-                        plot.settings.setMerged(new boolean[] { false, false, false, false });
+                    } else {
+                        plot.settings.setMerged(new boolean[]{false, false, false, false});
                     }
 
                     String[] flags_string;
                     final String myflags = r.getString("flags");
                     if (myflags == null) {
-                        flags_string = new String[] {};
-                    }
-                    else {
+                        flags_string = new String[]{};
+                    } else {
                         flags_string = myflags.split(",");
                     }
                     final ArrayList flags = new ArrayList();
@@ -640,12 +607,10 @@ public class SQLManager implements AbstractDB {
                             final String[] split = element.split(":");
                             try {
                                 flags.add(new Flag(FlagManager.getFlag(split[0], true), split[1].replaceAll("\u00AF", ":").replaceAll("�", ",")));
-                            }
-                            catch (final Exception e) {
+                            } catch (final Exception e) {
                                 exception = true;
                             }
-                        }
-                        else {
+                        } else {
                             flags.add(new Flag(FlagManager.getFlag(element, true), ""));
                         }
                     }
@@ -654,8 +619,7 @@ public class SQLManager implements AbstractDB {
                         setFlags(id, flags.toArray(new Flag[0]));
                     }
                     plot.settings.setFlags(flags.toArray(new Flag[0]));
-                }
-                else {
+                } else {
                     PlotMain.sendConsoleSenderMessage("&cPLOT " + id + " in plot_settings does not exist. Please create the plot or remove this entry.");
                 }
             }
@@ -675,8 +639,7 @@ public class SQLManager implements AbstractDB {
             if (invalidPlot) {
                 PlotMain.sendConsoleSenderMessage("&c[WARNING] - Please create the world/s or remove the plots using the purge command");
             }
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             Logger.add(LogLevel.WARNING, "Failed to load plots.");
             e.printStackTrace();
         }
@@ -699,8 +662,7 @@ public class SQLManager implements AbstractDB {
                     stmt.setInt(2, getId(world, plot.id));
                     stmt.execute();
                     stmt.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "Could not set merged for plot " + plot.id);
                 }
@@ -729,8 +691,7 @@ public class SQLManager implements AbstractDB {
                     stmt.setInt(2, getId(world, plot.id));
                     stmt.execute();
                     stmt.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "Could not set flag for plot " + plot.id);
                 }
@@ -755,8 +716,7 @@ public class SQLManager implements AbstractDB {
                     stmt.setInt(2, id);
                     stmt.execute();
                     stmt.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "Could not set flag for plot " + id);
                 }
@@ -781,8 +741,7 @@ public class SQLManager implements AbstractDB {
                     stmt.setInt(2, getId(world, plot.id));
                     stmt.executeUpdate();
                     stmt.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     Logger.add(LogLevel.WARNING, "Failed to set alias for plot " + plot.id);
                     e.printStackTrace();
                 }
@@ -816,8 +775,7 @@ public class SQLManager implements AbstractDB {
                         final int id = result.getInt("id");
                         ids.add(id);
                     }
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "FAILED TO PURGE WORLD '" + world + "'!");
                     return;
@@ -853,8 +811,7 @@ public class SQLManager implements AbstractDB {
                         stmt.setString(1, world);
                         stmt.executeUpdate();
                         stmt.close();
-                    }
-                    catch (final SQLException e) {
+                    } catch (final SQLException e) {
                         e.printStackTrace();
                         Logger.add(LogLevel.DANGER, "FAILED TO PURGE PLOT FROM DB '" + world + "' , '" + id + "' !");
                         return;
@@ -881,8 +838,7 @@ public class SQLManager implements AbstractDB {
                         final int id = result.getInt("id");
                         ids.add(id);
                     }
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "FAILED TO PURGE WORLD '" + world + "'!");
                     return;
@@ -918,8 +874,7 @@ public class SQLManager implements AbstractDB {
                         stmt.setString(1, world);
                         stmt.executeUpdate();
                         stmt.close();
-                    }
-                    catch (final SQLException e) {
+                    } catch (final SQLException e) {
                         e.printStackTrace();
                         Logger.add(LogLevel.DANGER, "FAILED TO PURGE WORLD '" + world + "'!");
                         return;
@@ -947,8 +902,7 @@ public class SQLManager implements AbstractDB {
                     stmt.setInt(2, getId(world, plot.id));
                     stmt.executeUpdate();
                     stmt.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     Logger.add(LogLevel.WARNING, "Failed to set position for plot " + plot.id);
                     e.printStackTrace();
                 }
@@ -958,6 +912,7 @@ public class SQLManager implements AbstractDB {
 
     /**
      * @param id
+     *
      * @return
      */
     @Override
@@ -1000,8 +955,7 @@ public class SQLManager implements AbstractDB {
                 h.put(var, val);
             }
             stmt.close();
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             Logger.add(LogLevel.WARNING, "Failed to load settings for plot: " + id);
             e.printStackTrace();
         }
@@ -1021,8 +975,7 @@ public class SQLManager implements AbstractDB {
                     statement.setString(4, comment.senderName);
                     statement.executeUpdate();
                     statement.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "Failed to remove helper for plot " + plot.id);
                 }
@@ -1046,8 +999,7 @@ public class SQLManager implements AbstractDB {
                 comments.add(comment);
             }
             statement.close();
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             Logger.add(LogLevel.WARNING, "Failed to fetch rating for plot " + plot.getId().toString());
             e.printStackTrace();
         }
@@ -1067,8 +1019,7 @@ public class SQLManager implements AbstractDB {
                     statement.setString(4, comment.senderName);
                     statement.executeUpdate();
                     statement.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "Failed to remove helper for plot " + plot.id);
                 }
@@ -1092,8 +1043,7 @@ public class SQLManager implements AbstractDB {
                     statement.setString(2, UUIDHandler.getUUID(player).toString());
                     statement.executeUpdate();
                     statement.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "Failed to remove helper for plot " + plot.id);
                 }
@@ -1116,8 +1066,7 @@ public class SQLManager implements AbstractDB {
                     statement.setString(2, UUIDHandler.getUUID(player).toString());
                     statement.executeUpdate();
                     statement.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "Failed to remove trusted user for plot " + plot.id);
                 }
@@ -1140,8 +1089,7 @@ public class SQLManager implements AbstractDB {
                     statement.setString(2, UUIDHandler.getUUID(player).toString());
                     statement.executeUpdate();
                     statement.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     Logger.add(LogLevel.WARNING, "Failed to set helper for plot " + plot.id);
                     e.printStackTrace();
                 }
@@ -1164,8 +1112,7 @@ public class SQLManager implements AbstractDB {
                     statement.setString(2, UUIDHandler.getUUID(player).toString());
                     statement.executeUpdate();
                     statement.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     Logger.add(LogLevel.WARNING, "Failed to set plot trusted for plot " + plot.id);
                     e.printStackTrace();
                 }
@@ -1188,8 +1135,7 @@ public class SQLManager implements AbstractDB {
                     statement.setString(2, UUIDHandler.getUUID(player).toString());
                     statement.executeUpdate();
                     statement.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     e.printStackTrace();
                     Logger.add(LogLevel.WARNING, "Failed to remove denied for plot " + plot.id);
                 }
@@ -1212,8 +1158,7 @@ public class SQLManager implements AbstractDB {
                     statement.setString(2, UUIDHandler.getUUID(player).toString());
                     statement.executeUpdate();
                     statement.close();
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     Logger.add(LogLevel.WARNING, "Failed to set denied for plot " + plot.id);
                     e.printStackTrace();
                 }
@@ -1233,8 +1178,7 @@ public class SQLManager implements AbstractDB {
             }
             statement.close();
             return rating;
-        }
-        catch (final SQLException e) {
+        } catch (final SQLException e) {
             Logger.add(LogLevel.WARNING, "Failed to fetch rating for plot " + plot.getId().toString());
             e.printStackTrace();
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLite.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLite.java
index ce6d112d6..7b1891b86 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLite.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/SQLite.java
@@ -21,17 +21,13 @@
 
 package com.intellectualcrafters.plot.database;
 
+import org.bukkit.plugin.Plugin;
+
 import java.io.File;
 import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 import java.util.logging.Level;
 
-import org.bukkit.plugin.Plugin;
-
 /**
  * Connects to and uses a SQLite database
  *
@@ -41,15 +37,13 @@ import org.bukkit.plugin.Plugin;
 public class SQLite extends Database {
 
     private final String dbLocation;
-    private Connection   connection;
+    private Connection connection;
 
     /**
      * Creates a new SQLite instance
      *
-     * @param plugin
-     *            Plugin instance
-     * @param dbLocation
-     *            Location of the Database (Must end in .db)
+     * @param plugin     Plugin instance
+     * @param dbLocation Location of the Database (Must end in .db)
      */
     public SQLite(final Plugin plugin, final String dbLocation) {
         super(plugin);
@@ -68,8 +62,7 @@ public class SQLite extends Database {
         if (!(file.exists())) {
             try {
                 file.createNewFile();
-            }
-            catch (final IOException e) {
+            } catch (final IOException e) {
                 this.plugin.getLogger().log(Level.SEVERE, "Unable to create database!");
             }
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java
index 88b521adc..202267824 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerClaimPlotEvent.java
@@ -21,31 +21,27 @@
 
 package com.intellectualcrafters.plot.events;
 
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * @author Citymonstret
  * @author Empire92
  */
-@SuppressWarnings("unused")
-public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable {
+@SuppressWarnings("unused") public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable {
     private static HandlerList handlers = new HandlerList();
-    private final Plot         plot;
-    private final boolean      auto;
-    private boolean            cancelled;
+    private final Plot plot;
+    private final boolean auto;
+    private boolean cancelled;
 
     /**
      * PlayerClaimPlotEvent: Called when a plot is claimed
      *
-     * @param player
-     *            Player that claimed the plot
-     * @param plot
-     *            Plot that was claimed
+     * @param player Player that claimed the plot
+     * @param plot   Plot that was claimed
      */
     public PlayerClaimPlotEvent(final Player player, final Plot plot, final boolean auto) {
         super(player);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java
index 332e8fb19..25698112b 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerEnterPlotEvent.java
@@ -21,12 +21,11 @@
 
 package com.intellectualcrafters.plot.events;
 
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * @author Citymonstret
  * @author Empire92
@@ -35,15 +34,13 @@ public class PlayerEnterPlotEvent extends PlayerEvent {
 
     private static HandlerList handlers = new HandlerList();
 
-    private final Plot         plot;
+    private final Plot plot;
 
     /**
      * PlayerEnterPlotEvent: Called when a player leaves a plot
      *
-     * @param player
-     *            Player that entered the plot
-     * @param plot
-     *            Plot that was entered
+     * @param player Player that entered the plot
+     * @param plot   Plot that was entered
      */
     public PlayerEnterPlotEvent(final Player player, final Plot plot) {
         super(player);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java
index 22e5b1f5e..0414b0dda 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerLeavePlotEvent.java
@@ -21,12 +21,11 @@
 
 package com.intellectualcrafters.plot.events;
 
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * @author Citymonstret
  * @author Empire92
@@ -34,15 +33,13 @@ import com.intellectualcrafters.plot.object.Plot;
 public class PlayerLeavePlotEvent extends PlayerEvent {
     private static HandlerList handlers = new HandlerList();
 
-    private final Plot         plot;
+    private final Plot plot;
 
     /**
      * PlayerLeavePlotEvent: Called when a player leaves a plot
      *
-     * @param player
-     *            Player that left the plot
-     * @param plot
-     *            Plot that was left
+     * @param player Player that left the plot
+     * @param plot   Plot that was left
      */
     public PlayerLeavePlotEvent(final Player player, final Plot plot) {
         super(player);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java
index 5193b3ae0..416f7be7a 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotDeniedEvent.java
@@ -21,13 +21,12 @@
 
 package com.intellectualcrafters.plot.events;
 
-import java.util.UUID;
-
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.Plot;
+import java.util.UUID;
 
 /**
  * @author Citymonstret
@@ -36,23 +35,18 @@ import com.intellectualcrafters.plot.object.Plot;
 public class PlayerPlotDeniedEvent extends Event {
     private static HandlerList handlers = new HandlerList();
 
-    private final Plot         plot;
-    private final Player       initiator;
-    private final boolean      added;
-    private final UUID         player;
+    private final Plot plot;
+    private final Player initiator;
+    private final boolean added;
+    private final UUID player;
 
     /**
-     * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a
-     * plot
+     * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot
      *
-     * @param initiator
-     *            Player that initiated the event
-     * @param plot
-     *            Plot in which the event occurred
-     * @param player
-     *            Player that was denied/un-denied
-     * @param added
-     *            true of add to deny list, false if removed
+     * @param initiator Player that initiated the event
+     * @param plot      Plot in which the event occurred
+     * @param player    Player that was denied/un-denied
+     * @param added     true of add to deny list, false if removed
      */
     public PlayerPlotDeniedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added) {
         this.initiator = initiator;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java
index 10538aaa1..2cb310f79 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotHelperEvent.java
@@ -21,13 +21,12 @@
 
 package com.intellectualcrafters.plot.events;
 
-import java.util.UUID;
-
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.Plot;
+import java.util.UUID;
 
 /**
  * @author Empire92
@@ -36,22 +35,18 @@ import com.intellectualcrafters.plot.object.Plot;
 public class PlayerPlotHelperEvent extends Event {
     private static HandlerList handlers = new HandlerList();
 
-    private final Plot         plot;
-    private final Player       initiator;
-    private final boolean      added;
-    private final UUID         player;
+    private final Plot plot;
+    private final Player initiator;
+    private final boolean added;
+    private final UUID player;
 
     /**
      * PlayerPlotHelperEvent: Called when a plot helper is added/removed
      *
-     * @param initiator
-     *            Player that initiated the event
-     * @param plot
-     *            Plot in which the event occurred
-     * @param player
-     *            Player that was added/removed from the helper list
-     * @param added
-     *            true of the player was added, false if the player was removed
+     * @param initiator Player that initiated the event
+     * @param plot      Plot in which the event occurred
+     * @param player    Player that was added/removed from the helper list
+     * @param added     true of the player was added, false if the player was removed
      */
     public PlayerPlotHelperEvent(final Player initiator, final Plot plot, final UUID player, final boolean added) {
         this.initiator = initiator;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java
index 62776895a..348c2778f 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerPlotTrustedEvent.java
@@ -21,13 +21,12 @@
 
 package com.intellectualcrafters.plot.events;
 
-import java.util.UUID;
-
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.Plot;
+import java.util.UUID;
 
 /**
  * @author Citymonstret
@@ -36,22 +35,18 @@ import com.intellectualcrafters.plot.object.Plot;
 public class PlayerPlotTrustedEvent extends Event {
     private static HandlerList handlers = new HandlerList();
 
-    private final Plot         plot;
-    private final Player       initiator;
-    private final boolean      added;
-    private final UUID         player;
+    private final Plot plot;
+    private final Player initiator;
+    private final boolean added;
+    private final UUID player;
 
     /**
      * PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed
      *
-     * @param initiator
-     *            Player that initiated the event
-     * @param plot
-     *            Plot in which the event occurred
-     * @param player
-     *            Player that was added/removed from the trusted list
-     * @param added
-     *            true of the player was added, false if the player was removed
+     * @param initiator Player that initiated the event
+     * @param plot      Plot in which the event occurred
+     * @param player    Player that was added/removed from the trusted list
+     * @param added     true of the player was added, false if the player was removed
      */
     public PlayerPlotTrustedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added) {
         this.initiator = initiator;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java
index 9c39babf4..792e2f5d3 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlayerTeleportToPlotEvent.java
@@ -21,14 +21,13 @@
 
 package com.intellectualcrafters.plot.events;
 
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * Called when a player teleports to a plot
  *
@@ -38,20 +37,17 @@ import com.intellectualcrafters.plot.object.Plot;
 public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
 
-    private final Location           from;
-    private final Plot               plot;
+    private final Location from;
+    private final Plot plot;
 
-    private boolean                  cancelled;
+    private boolean cancelled;
 
     /**
      * PlayerTeleportToPlotEvent: Called when a player teleports to a plot
      *
-     * @param player
-     *            That was teleported
-     * @param from
-     *            Start location
-     * @param plot
-     *            Plot to which the player was teleported
+     * @param player That was teleported
+     * @param from   Start location
+     * @param plot   Plot to which the player was teleported
      */
     public PlayerTeleportToPlotEvent(final Player player, final Location from, final Plot plot) {
         super(player);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotClearEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotClearEvent.java
index 0f247f2a0..2e24b7dc7 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotClearEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotClearEvent.java
@@ -21,12 +21,11 @@
 
 package com.intellectualcrafters.plot.events;
 
+import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.PlotId;
-
 /**
  * Called when a plot is cleared
  *
@@ -35,17 +34,15 @@ import com.intellectualcrafters.plot.object.PlotId;
  */
 public class PlotClearEvent extends Event implements Cancellable {
     private static HandlerList handlers = new HandlerList();
-    private final PlotId       id;
-    private final String       world;
-    private boolean            cancelled;
+    private final PlotId id;
+    private final String world;
+    private boolean cancelled;
 
     /**
      * PlotDeleteEvent: Called when a plot is cleared
      *
-     * @param world
-     *            The world in which the plot was cleared
-     * @param id
-     *            The plot that was cleared
+     * @param world The world in which the plot was cleared
+     * @param id    The plot that was cleared
      */
     public PlotClearEvent(final String world, final PlotId id) {
         this.id = id;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java
index 3deeed030..0059b8f7b 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotDeleteEvent.java
@@ -21,12 +21,11 @@
 
 package com.intellectualcrafters.plot.events;
 
+import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.PlotId;
-
 /**
  * Called when a plot is deleted
  *
@@ -35,17 +34,15 @@ import com.intellectualcrafters.plot.object.PlotId;
  */
 public class PlotDeleteEvent extends Event implements Cancellable {
     private static HandlerList handlers = new HandlerList();
-    private final PlotId       id;
-    private final String       world;
-    private boolean            cancelled;
+    private final PlotId id;
+    private final String world;
+    private boolean cancelled;
 
     /**
      * PlotDeleteEvent: Called when a plot is deleted
      *
-     * @param world
-     *            The world in which the plot was deleted
-     * @param id
-     *            The ID of the plot that was deleted
+     * @param world The world in which the plot was deleted
+     * @param id    The ID of the plot that was deleted
      */
     public PlotDeleteEvent(final String world, final PlotId id) {
         this.id = id;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java
index a685603cb..89505350a 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagAddEvent.java
@@ -21,13 +21,12 @@
 
 package com.intellectualcrafters.plot.events;
 
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * Called when a Flag is added to a plot
  *
@@ -36,17 +35,15 @@ import com.intellectualcrafters.plot.object.Plot;
  */
 public class PlotFlagAddEvent extends Event implements Cancellable {
     private static HandlerList handlers = new HandlerList();
-    private final Plot         plot;
-    private final Flag         flag;
-    private boolean            cancelled;
+    private final Plot plot;
+    private final Flag flag;
+    private boolean cancelled;
 
     /**
      * PlotFlagAddEvent: Called when a Flag is added to a plot
      *
-     * @param flag
-     *            Flag that was added
-     * @param plot
-     *            Plot to which the flag was added
+     * @param flag Flag that was added
+     * @param plot Plot to which the flag was added
      */
     public PlotFlagAddEvent(final Flag flag, final Plot plot) {
         this.plot = plot;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java
index 2a5eb0386..23e99bef4 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotFlagRemoveEvent.java
@@ -21,13 +21,12 @@
 
 package com.intellectualcrafters.plot.events;
 
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * Called when a flag is removed from a plot
  *
@@ -36,17 +35,15 @@ import com.intellectualcrafters.plot.object.Plot;
  */
 public class PlotFlagRemoveEvent extends Event implements Cancellable {
     private static HandlerList handlers = new HandlerList();
-    private final Plot         plot;
-    private final Flag         flag;
-    private boolean            cancelled;
+    private final Plot plot;
+    private final Flag flag;
+    private boolean cancelled;
 
     /**
      * PlotFlagRemoveEvent: Called when a flag is removed from a plot
      *
-     * @param flag
-     *            Flag that was removed
-     * @param plot
-     *            Plot from which the flag was removed
+     * @param flag Flag that was removed
+     * @param plot Plot from which the flag was removed
      */
     public PlotFlagRemoveEvent(final Flag flag, final Plot plot) {
         this.plot = plot;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotMergeEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotMergeEvent.java
index 4a678890b..ba7395edd 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotMergeEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotMergeEvent.java
@@ -21,35 +21,31 @@
 
 package com.intellectualcrafters.plot.events;
 
-import java.util.ArrayList;
-
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.World;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
+import java.util.ArrayList;
 
 /**
  * @author Empire92
  */
 public class PlotMergeEvent extends Event implements Cancellable {
-    private static HandlerList      handlers = new HandlerList();
+    private static HandlerList handlers = new HandlerList();
     private final ArrayList plots;
-    private boolean                 cancelled;
-    private Plot                    plot;
-    private World                   world;
+    private boolean cancelled;
+    private Plot plot;
+    private World world;
 
     /**
      * PlotMergeEvent: Called when plots are merged
      *
-     * @param world
-     *            World in which the event occurred
-     * @param plot
-     *            Plot that was merged
-     * @param plots
-     *            A list of plots involved in the event
+     * @param world World in which the event occurred
+     * @param plot  Plot that was merged
+     * @param plots A list of plots involved in the event
      */
     public PlotMergeEvent(final World world, final Plot plot, final ArrayList plots) {
         this.plots = plots;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java
index ef562f247..6727ab007 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/events/PlotUnlinkEvent.java
@@ -21,31 +21,28 @@
 
 package com.intellectualcrafters.plot.events;
 
-import java.util.ArrayList;
-
+import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.World;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.PlotId;
+import java.util.ArrayList;
 
 /**
  * @author Empire92
  */
 public class PlotUnlinkEvent extends Event implements Cancellable {
-    private static HandlerList      handlers = new HandlerList();
+    private static HandlerList handlers = new HandlerList();
     private final ArrayList plots;
-    private final World             world;
-    private boolean                 cancelled;
+    private final World world;
+    private boolean cancelled;
 
     /**
      * Called when a mega-plot is unlinked.
      *
-     * @param world
-     *            World in which the event occurred
-     * @param plots
-     *            Plots that are involved in the event
+     * @param world World in which the event occurred
+     * @param plots Plots that are involved in the event
      */
     public PlotUnlinkEvent(final World world, final ArrayList plots) {
         this.plots = plots;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
index 9ecf59355..09a6a8d7d 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
@@ -31,7 +31,7 @@ import org.apache.commons.lang.StringUtils;
  */
 public class AbstractFlag {
 
-    private final String       key;
+    private final String key;
     private final FlagValue value;
 
     public AbstractFlag(final String key) {
@@ -41,9 +41,7 @@ public class AbstractFlag {
     /**
      * AbstractFlag is a parameter used in creating a new Flag
      *
-     * @param key
-     *            The key must be alphabetical characters and <= 16 characters
-     *            in length
+     * @param key The key must be alphabetical characters and <= 16 characters in length
      */
     public AbstractFlag(final String key, final FlagValue value) {
         if (!StringUtils.isAlpha(key.replaceAll("_", "").replaceAll("-", ""))) {
@@ -55,8 +53,7 @@ public class AbstractFlag {
         this.key = key.toLowerCase();
         if (value == null) {
             this.value = new FlagValue.StringValue();
-        }
-        else {
+        } else {
             this.value = value;
         }
     }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/Flag.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/Flag.java
index e8e12f1f7..a5ec4551b 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/Flag.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/Flag.java
@@ -25,23 +25,19 @@ import org.apache.commons.lang.StringUtils;
 
 public class Flag {
     private final AbstractFlag key;
-    private final String       value;
+    private final String value;
 
     /**
-     * Flag object used to store basic information for a Plot. Flags are a
-     * key/value pair. For a flag to be usable by a player, you need to register
-     * it with PlotSquared.
+     * Flag object used to store basic information for a Plot. Flags are a key/value pair. For a flag to be usable by a
+     * player, you need to register it with PlotSquared.
      *
-     * @param key
-     *            AbstractFlag
-     * @param value
-     *            Value must be alphanumerical (can have spaces) and be <= 48
-     *            characters
-     * @throws IllegalArgumentException
-     *             if you provide inadequate inputs
+     * @param key   AbstractFlag
+     * @param value Value must be alphanumerical (can have spaces) and be <= 48 characters
+     *
+     * @throws IllegalArgumentException if you provide inadequate inputs
      */
     public Flag(final AbstractFlag key, final String value) {
-        final char[] allowedCharacters = new char[] { '[', ']', '(', ')', ',', '_', '-', '.', ',', '?', '!', '&', ':', '\u00A7' };
+        final char[] allowedCharacters = new char[]{'[', ']', '(', ')', ',', '_', '-', '.', ',', '?', '!', '&', ':', '\u00A7'};
         String tempValue = value;
         for (final char c : allowedCharacters) {
             tempValue = tempValue.replace(c, 'c');
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
index 086f1b647..2be6282cd 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
@@ -21,22 +21,20 @@
 
 package com.intellectualcrafters.plot.flag;
 
+import com.intellectualcrafters.plot.object.Plot;
+import org.bukkit.entity.Player;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * Flag Manager Utility
  *
  * @author Citymonstret
  * @author Empire92
  */
-@SuppressWarnings("unused")
-public class FlagManager {
+@SuppressWarnings("unused") public class FlagManager {
 
     // TODO add some flags
     // - Plot clear interval
@@ -48,8 +46,8 @@ public class FlagManager {
     /**
      * Register an AbstractFlag with PlotSquared
      *
-     * @param flag
-     *            Flag to register
+     * @param flag Flag to register
+     *
      * @return success?
      */
     public static boolean addFlag(final AbstractFlag flag) {
@@ -90,8 +88,8 @@ public class FlagManager {
     /**
      * Get a list of registerd AbstragFlag objects based on player permissions
      *
-     * @param player
-     *            with permissions
+     * @param player with permissions
+     *
      * @return List (AbstractFlag)
      */
     public static List getFlags(final Player player) {
@@ -107,8 +105,8 @@ public class FlagManager {
     /**
      * Get an AbstractFlag by a string Returns null if flag does not exist
      *
-     * @param string
-     *            Flag Key
+     * @param string Flag Key
+     *
      * @return AbstractFlag
      */
     public static AbstractFlag getFlag(final String string) {
@@ -123,10 +121,9 @@ public class FlagManager {
     /**
      * Get an AbstractFlag by a string
      *
-     * @param string
-     *            Flag Key
-     * @param create
-     *            If to create the flag if it does not exist
+     * @param string Flag Key
+     * @param create If to create the flag if it does not exist
+     *
      * @return AbstractFlag
      */
     public static AbstractFlag getFlag(final String string, final boolean create) {
@@ -141,8 +138,8 @@ public class FlagManager {
     /**
      * Remove a registered AbstractFlag
      *
-     * @param flag
-     *            Flag Key
+     * @param flag Flag Key
+     *
      * @return boolean Result of operation
      */
     public static boolean removeFlag(final AbstractFlag flag) {
@@ -155,8 +152,7 @@ public class FlagManager {
             final String[] split = flagstrings.get(i).split(";");
             if (split.length == 1) {
                 flags[i] = new Flag(getFlag(split[0], true), "");
-            }
-            else {
+            } else {
                 flags[i] = new Flag(getFlag(split[0], true), split[1]);
             }
         }
@@ -166,8 +162,8 @@ public class FlagManager {
     /**
      * Get the flags for a plot
      *
-     * @param plot
-     *            Plot to search in
+     * @param plot Plot to search in
+     *
      * @return List (AbstractFlag)
      */
     public static List getPlotFlags(final Plot plot) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotManager.java
index 234cc7968..e98113a60 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotManager.java
@@ -21,8 +21,10 @@
 
 package com.intellectualcrafters.plot.generator;
 
-import java.util.ArrayList;
-
+import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.object.*;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.PlotHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -30,27 +32,16 @@ import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.plugin.Plugin;
 
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import java.util.ArrayList;
 
-@SuppressWarnings("deprecation")
-public class DefaultPlotManager extends PlotManager {
+@SuppressWarnings("deprecation") public class DefaultPlotManager extends PlotManager {
 
     /**
-     * Default implementation of getting a plot at a given location For a
-     * simplified explanation of the math involved: - Get the current coords -
-     * shift these numbers down to something relatable for a single plot
-     * (similar to reducing trigonometric functions down to the first quadrant)
-     * - e.g. If the plot size is 20 blocks, and we are at x=25, it's equivalent
-     * to x=5 for that specific plot From this, and knowing how thick the road
-     * is, we can say whether x=5 is road, or plot. The number of shifts done,
-     * is also counted, and this number gives us the PlotId
+     * Default implementation of getting a plot at a given location For a simplified explanation of the math involved: -
+     * Get the current coords - shift these numbers down to something relatable for a single plot (similar to reducing
+     * trigonometric functions down to the first quadrant) - e.g. If the plot size is 20 blocks, and we are at x=25,
+     * it's equivalent to x=5 for that specific plot From this, and knowing how thick the road is, we can say whether
+     * x=5 is road, or plot. The number of shifts done, is also counted, and this number gives us the PlotId
      */
     @Override
     public PlotId getPlotIdAbs(final PlotWorld plotworld, final Location loc) {
@@ -68,8 +59,7 @@ public class DefaultPlotManager extends PlotManager {
         int pathWidthLower;
         if ((dpw.ROAD_WIDTH % 2) == 0) {
             pathWidthLower = (int) (Math.floor(dpw.ROAD_WIDTH / 2) - 1);
-        }
-        else {
+        } else {
             pathWidthLower = (int) Math.floor(dpw.ROAD_WIDTH / 2);
         }
 
@@ -101,8 +91,7 @@ public class DefaultPlotManager extends PlotManager {
     }
 
     /**
-     * Some complex stuff for traversing mega plots (return getPlotIdAbs if you
-     * do not support mega plots)
+     * Some complex stuff for traversing mega plots (return getPlotIdAbs if you do not support mega plots)
      */
     @Override
     public PlotId getPlotId(final PlotWorld plotworld, final Location loc) {
@@ -118,8 +107,7 @@ public class DefaultPlotManager extends PlotManager {
         int pathWidthLower;
         if ((dpw.ROAD_WIDTH % 2) == 0) {
             pathWidthLower = (int) (Math.floor(dpw.ROAD_WIDTH / 2) - 1);
-        }
-        else {
+        } else {
             pathWidthLower = (int) Math.floor(dpw.ROAD_WIDTH / 2);
         }
 
@@ -188,9 +176,8 @@ public class DefaultPlotManager extends PlotManager {
     }
 
     /**
-     * Check if a location is inside a specific plot(non-Javadoc) - For this
-     * implementation, we don't need to do anything fancier than referring to
-     * getPlotIdAbs(...)
+     * Check if a location is inside a specific plot(non-Javadoc) - For this implementation, we don't need to do
+     * anything fancier than referring to getPlotIdAbs(...)
      */
     @Override
     public boolean isInPlotAbs(final PlotWorld plotworld, final Location loc, final PlotId plotid) {
@@ -231,12 +218,10 @@ public class DefaultPlotManager extends PlotManager {
     }
 
     /**
-     * Clearing the plot needs to only consider removing the blocks - This
-     * implementation has used the SetCuboid function, as it is fast, and uses
-     * NMS code - It also makes use of the fact that deleting chunks is a lot
-     * faster than block updates This code is very messy, but you don't need to
-     * do something quite as complex unless you happen to have 512x512 sized
-     * plots
+     * Clearing the plot needs to only consider removing the blocks - This implementation has used the SetCuboid
+     * function, as it is fast, and uses NMS code - It also makes use of the fact that deleting chunks is a lot faster
+     * than block updates This code is very messy, but you don't need to do something quite as complex unless you happen
+     * to have 512x512 sized plots
      */
     @Override
     public boolean clearPlot(final World world, final Plot plot, final boolean isDelete) {
@@ -262,8 +247,7 @@ public class DefaultPlotManager extends PlotManager {
 
         if (isDelete) {
             wall = dpw.WALL_BLOCK;
-        }
-        else {
+        } else {
             wall = dpw.CLAIMED_WALL_BLOCK;
         }
 
@@ -346,8 +330,7 @@ public class DefaultPlotManager extends PlotManager {
                                 if (mn == null) {
                                     mn = new Location(world, Math.max(i - 1, plotMinX), 0, Math.max(j - 1, plotMinZ));
                                     mx = new Location(world, Math.min(i + 16, plotMaxX), 0, Math.min(j + 16, plotMaxZ));
-                                }
-                                else if ((mx.getBlockZ() < (j + 15)) || (mx.getBlockX() < (i + 15))) {
+                                } else if ((mx.getBlockZ() < (j + 15)) || (mx.getBlockX() < (i + 15))) {
                                     mx = new Location(world, Math.min(i + 16, plotMaxX), 0, Math.min(j + 16, plotMaxZ));
                                 }
                                 world.regenerateChunk(i / 16, j / 16);
@@ -378,8 +361,7 @@ public class DefaultPlotManager extends PlotManager {
                                 }
                             }, 5L);
                             return;
-                        }
-                        else {
+                        } else {
 
                             if (min.getBlockX() < plotMinX) {
                                 min.setX(plotMinX);
@@ -872,8 +854,7 @@ public class DefaultPlotManager extends PlotManager {
     }
 
     /**
-     * Finishing off plot merging by adding in the walls surrounding the plot
-     * (OPTIONAL)(UNFINISHED)
+     * Finishing off plot merging by adding in the walls surrounding the plot (OPTIONAL)(UNFINISHED)
      */
     @Override
     public boolean finishPlotMerge(final World world, final PlotWorld plotworld, final ArrayList plotIds) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java
index 8480d3c3c..0c0e08b91 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java
@@ -21,14 +21,13 @@
 
 package com.intellectualcrafters.plot.generator;
 
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.configuration.ConfigurationSection;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.Configuration;
 import com.intellectualcrafters.plot.config.ConfigurationNode;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.object.PlotWorld;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.configuration.ConfigurationSection;
 
 public class DefaultPlotWorld extends PlotWorld {
 
@@ -41,98 +40,98 @@ public class DefaultPlotWorld extends PlotWorld {
     /**
      * Default Road Height: 64
      */
-    public final static int         ROAD_HEIGHT_DEFAULT          = 64;
+    public final static int ROAD_HEIGHT_DEFAULT = 64;
     /**
      * Default plot height: 64
      */
-    public final static int         PLOT_HEIGHT_DEFAULT          = 64;
+    public final static int PLOT_HEIGHT_DEFAULT = 64;
     /**
      * Default Wall Height: 64
      */
-    public final static int         WALL_HEIGHT_DEFAULT          = 64;
+    public final static int WALL_HEIGHT_DEFAULT = 64;
     /**
      * Default plot width: 32
      */
-    public final static int         PLOT_WIDTH_DEFAULT           = 32;
+    public final static int PLOT_WIDTH_DEFAULT = 32;
     /**
      * Default road width: 7
      */
-    public final static int         ROAD_WIDTH_DEFAULT           = 7;
+    public final static int ROAD_WIDTH_DEFAULT = 7;
     /**
      * Default main block: 1
      */
-    public final static PlotBlock[] MAIN_BLOCK_DEFAULT           = new PlotBlock[] { new PlotBlock((short) 1, (byte) 0) };
+    public final static PlotBlock[] MAIN_BLOCK_DEFAULT = new PlotBlock[]{new PlotBlock((short) 1, (byte) 0)};
     /**
      * Default top blocks: {"2"}
      */
-    public final static PlotBlock[] TOP_BLOCK_DEFAULT            = new PlotBlock[] { new PlotBlock((short) 2, (byte) 0) };
+    public final static PlotBlock[] TOP_BLOCK_DEFAULT = new PlotBlock[]{new PlotBlock((short) 2, (byte) 0)};
     /**
      * Default wall block: 44
      */
-    public final static PlotBlock   WALL_BLOCK_DEFAULT           = new PlotBlock((short) 44, (byte) 0);
-    public final static PlotBlock   CLAIMED_WALL_BLOCK_DEFAULT   = new PlotBlock((short) 44, (byte) 1);
+    public final static PlotBlock WALL_BLOCK_DEFAULT = new PlotBlock((short) 44, (byte) 0);
+    public final static PlotBlock CLAIMED_WALL_BLOCK_DEFAULT = new PlotBlock((short) 44, (byte) 1);
     /**
      * Default wall filling: 1
      */
-    public final static PlotBlock   WALL_FILLING_DEFAULT         = new PlotBlock((short) 1, (byte) 0);
+    public final static PlotBlock WALL_FILLING_DEFAULT = new PlotBlock((short) 1, (byte) 0);
     /**
      * Default road stripes: 35
      */
-    public final static PlotBlock   ROAD_STRIPES_DEFAULT         = new PlotBlock((short) 98, (byte) 0);
-    public final static boolean     ROAD_STRIPES_ENABLED_DEFAULT = false;
+    public final static PlotBlock ROAD_STRIPES_DEFAULT = new PlotBlock((short) 98, (byte) 0);
+    public final static boolean ROAD_STRIPES_ENABLED_DEFAULT = false;
     /**
      * Default road block: 155
      */
-    public final static PlotBlock   ROAD_BLOCK_DEFAULT           = new PlotBlock((short) 155, (byte) 0);
+    public final static PlotBlock ROAD_BLOCK_DEFAULT = new PlotBlock((short) 155, (byte) 0);
     /**
      * Road Height
      */
-    public int                      ROAD_HEIGHT;
+    public int ROAD_HEIGHT;
     /**
      * plot height
      */
-    public int                      PLOT_HEIGHT;
+    public int PLOT_HEIGHT;
     /**
      * Wall height
      */
-    public int                      WALL_HEIGHT;
+    public int WALL_HEIGHT;
     /**
      * plot width
      */
-    public int                      PLOT_WIDTH;
+    public int PLOT_WIDTH;
     /**
      * Road width
      */
-    public int                      ROAD_WIDTH;
+    public int ROAD_WIDTH;
     /**
      * Plot main block
      */
-    public PlotBlock[]              MAIN_BLOCK;
+    public PlotBlock[] MAIN_BLOCK;
     /**
      * Top blocks
      */
-    public PlotBlock[]              TOP_BLOCK;
+    public PlotBlock[] TOP_BLOCK;
     /**
      * Wall block
      */
-    public PlotBlock                WALL_BLOCK;
-    public PlotBlock                CLAIMED_WALL_BLOCK;
+    public PlotBlock WALL_BLOCK;
+    public PlotBlock CLAIMED_WALL_BLOCK;
     /**
      * Wall filling
      */
-    public PlotBlock                WALL_FILLING;
+    public PlotBlock WALL_FILLING;
     /**
      * Road stripes
      */
-    public PlotBlock                ROAD_STRIPES;
+    public PlotBlock ROAD_STRIPES;
     /**
      * enable road stripes
      */
-    public boolean                  ROAD_STRIPES_ENABLED;
+    public boolean ROAD_STRIPES_ENABLED;
     /**
      * Road block
      */
-    public PlotBlock                ROAD_BLOCK;
+    public PlotBlock ROAD_BLOCK;
 
     /*
      * Here we are just calling the super method, nothing special
@@ -142,25 +141,21 @@ public class DefaultPlotWorld extends PlotWorld {
     }
 
     /**
-     * CONFIG NODE | DEFAULT VALUE | DESCRIPTION | CONFIGURATION TYPE | REQUIRED
-     * FOR INITIAL SETUP
+     * CONFIG NODE | DEFAULT VALUE | DESCRIPTION | CONFIGURATION TYPE | REQUIRED FOR INITIAL SETUP
      * 

-     * Set the last boolean to false if you do not require a specific config
-     * node to be set while using the setup command - this may be useful if a
-     * config value can be changed at a later date, and has no impact on the
-     * actual world generation
+     * Set the last boolean to false if you do not require a specific config node to be set while using the setup
+     * command - this may be useful if a config value can be changed at a later date, and has no impact on the actual
+     * world generation
      */
     @Override
     public ConfigurationNode[] getSettingNodes() {
         // TODO return a set of configuration nodes (used for setup command)
-        return new ConfigurationNode[] { new ConfigurationNode("plot.height", DefaultPlotWorld.PLOT_HEIGHT_DEFAULT, "Plot height", Configuration.INTEGER, true), new ConfigurationNode("plot.size", DefaultPlotWorld.PLOT_WIDTH_DEFAULT, "Plot width", Configuration.INTEGER, true), new ConfigurationNode("plot.filling", DefaultPlotWorld.MAIN_BLOCK_DEFAULT, "Plot block", Configuration.BLOCKLIST, true), new ConfigurationNode("plot.floor", DefaultPlotWorld.TOP_BLOCK_DEFAULT, "Plot floor block", Configuration.BLOCKLIST, true), new ConfigurationNode("wall.block", DefaultPlotWorld.WALL_BLOCK_DEFAULT, "Top wall block", Configuration.BLOCK, true), new ConfigurationNode("wall.block_claimed", DefaultPlotWorld.CLAIMED_WALL_BLOCK_DEFAULT, "Wall block (claimed)", Configuration.BLOCK, true), new ConfigurationNode("road.width", DefaultPlotWorld.ROAD_WIDTH_DEFAULT, "Road width", Configuration.INTEGER, true),
-                new ConfigurationNode("road.height", DefaultPlotWorld.ROAD_HEIGHT_DEFAULT, "Road height", Configuration.INTEGER, true), new ConfigurationNode("road.enable_stripes", DefaultPlotWorld.ROAD_STRIPES_ENABLED_DEFAULT, "Enable road stripes", Configuration.BOOLEAN, true), new ConfigurationNode("road.block", DefaultPlotWorld.ROAD_BLOCK_DEFAULT, "Road block", Configuration.BLOCK, true), new ConfigurationNode("road.stripes", DefaultPlotWorld.ROAD_STRIPES_DEFAULT, "Road stripe block", Configuration.BLOCK, true), new ConfigurationNode("wall.filling", DefaultPlotWorld.WALL_FILLING_DEFAULT, "Wall filling block", Configuration.BLOCK, true), new ConfigurationNode("wall.height", DefaultPlotWorld.WALL_HEIGHT_DEFAULT, "Wall height", Configuration.INTEGER, true), };
+        return new ConfigurationNode[]{new ConfigurationNode("plot.height", DefaultPlotWorld.PLOT_HEIGHT_DEFAULT, "Plot height", Configuration.INTEGER, true), new ConfigurationNode("plot.size", DefaultPlotWorld.PLOT_WIDTH_DEFAULT, "Plot width", Configuration.INTEGER, true), new ConfigurationNode("plot.filling", DefaultPlotWorld.MAIN_BLOCK_DEFAULT, "Plot block", Configuration.BLOCKLIST, true), new ConfigurationNode("plot.floor", DefaultPlotWorld.TOP_BLOCK_DEFAULT, "Plot floor block", Configuration.BLOCKLIST, true), new ConfigurationNode("wall.block", DefaultPlotWorld.WALL_BLOCK_DEFAULT, "Top wall block", Configuration.BLOCK, true), new ConfigurationNode("wall.block_claimed", DefaultPlotWorld.CLAIMED_WALL_BLOCK_DEFAULT, "Wall block (claimed)", Configuration.BLOCK, true), new ConfigurationNode("road.width", DefaultPlotWorld.ROAD_WIDTH_DEFAULT, "Road width", Configuration.INTEGER, true), new ConfigurationNode("road.height", DefaultPlotWorld.ROAD_HEIGHT_DEFAULT, "Road height", Configuration.INTEGER, true), new ConfigurationNode("road.enable_stripes", DefaultPlotWorld.ROAD_STRIPES_ENABLED_DEFAULT, "Enable road stripes", Configuration.BOOLEAN, true), new ConfigurationNode("road.block", DefaultPlotWorld.ROAD_BLOCK_DEFAULT, "Road block", Configuration.BLOCK, true), new ConfigurationNode("road.stripes", DefaultPlotWorld.ROAD_STRIPES_DEFAULT, "Road stripe block", Configuration.BLOCK, true), new ConfigurationNode("wall.filling", DefaultPlotWorld.WALL_FILLING_DEFAULT, "Wall filling block", Configuration.BLOCK, true), new ConfigurationNode("wall.height", DefaultPlotWorld.WALL_HEIGHT_DEFAULT, "Wall height", Configuration.INTEGER, true),};
     }
 
     /**
-     * This method is called when a world loads. Make sure you set all your
-     * constants here. You are provided with the configuration section for that
-     * specific world.
+     * This method is called when a world loads. Make sure you set all your constants here. You are provided with the
+     * configuration section for that specific world.
      */
     @Override
     public void loadConfiguration(final ConfigurationSection config) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java
index ea4a63e6b..688a9bbaa 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java
@@ -21,27 +21,24 @@
 
 package com.intellectualcrafters.plot.generator;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.generator.BlockPopulator;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.object.PlotGenerator;
 import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotWorld;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.Biome;
+import org.bukkit.generator.BlockPopulator;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
 
 /**
- * The default generator is very messy, as we have decided
- * to try externalize all calculations from within the loop. - You will
- * see a lot of slower implementations have a single for loop. - This is
- * perfectly fine to do, it will just mean world generation may take
- * somewhat longer
+ * The default generator is very messy, as we have decided to try externalize all calculations from within the loop. -
+ * You will see a lot of slower implementations have a single for loop. - This is perfectly fine to do, it will just
+ * mean world generation may take somewhat longer
  *
  * @author Citymonstret
  * @author Empire92
@@ -50,35 +47,35 @@ public class WorldGenerator extends PlotGenerator {
     /**
      * Set to static to re-use the same managet for all Default World Generators
      */
-    private static PlotManager manager   = null;
+    private static PlotManager manager = null;
     /**
      * Some generator specific variables (implementation dependent)
      */
-    final int                  plotsize;
-    final int                  pathsize;
-    final PlotBlock            wall;
-    final PlotBlock            wallfilling;
-    final PlotBlock            floor1;
-    final PlotBlock            floor2;
-    final int                  size;
-    final Biome                biome;
-    final int                  roadheight;
-    final int                  wallheight;
-    final int                  plotheight;
-    final PlotBlock[]          plotfloors;
-    final PlotBlock[]          filling;
+    final int plotsize;
+    final int pathsize;
+    final PlotBlock wall;
+    final PlotBlock wallfilling;
+    final PlotBlock floor1;
+    final PlotBlock floor2;
+    final int size;
+    final Biome biome;
+    final int roadheight;
+    final int wallheight;
+    final int plotheight;
+    final PlotBlock[] plotfloors;
+    final PlotBlock[] filling;
     /**
      * result object is returned for each generated chunk, do stuff to it
      */
-    short[][]                  result;
+    short[][] result;
     /**
      * plotworld object
      */
-    DefaultPlotWorld           plotworld = null;
+    DefaultPlotWorld plotworld = null;
     /**
      * Faster sudo-random number generator than java.util.random
      */
-    private long               state;
+    private long state;
 
     /**
      * Initialize variables, and create plotworld object used in calculations
@@ -111,9 +108,8 @@ public class WorldGenerator extends PlotGenerator {
     }
 
     /**
-     * Return the plot manager for this type of generator, or create one For
-     * square plots you may as well use the default plot manager which comes
-     * with PlotSquared
+     * Return the plot manager for this type of generator, or create one For square plots you may as well use the
+     * default plot manager which comes with PlotSquared
      */
     @Override
     public PlotManager getPlotManager() {
@@ -132,8 +128,7 @@ public class WorldGenerator extends PlotGenerator {
     }
 
     /**
-     * Get a new plotworld class For square plots you can use the
-     * DefaultPlotWorld class which comes with PlotSquared
+     * Get a new plotworld class For square plots you can use the DefaultPlotWorld class which comes with PlotSquared
      */
     @Override
     public PlotWorld getNewPlotWorld(final String world) {
@@ -160,9 +155,8 @@ public class WorldGenerator extends PlotGenerator {
     }
 
     /**
-     * Cuboid based plot generation is quick, as it requires no calculations
-     * inside the loop - You don't have to use this this method, but you may
-     * find it useful.
+     * Cuboid based plot generation is quick, as it requires no calculations inside the loop - You don't have to use
+     * this this method, but you may find it useful.
      */
     public void setCuboidRegion(final int x1, final int x2, final int y1, final int y2, final int z1, final int z2, final PlotBlock block) {
         for (int x = x1; x < x2; x++) {
@@ -177,8 +171,7 @@ public class WorldGenerator extends PlotGenerator {
     private void setCuboidRegion(final int x1, final int x2, final int y1, final int y2, final int z1, final int z2, final PlotBlock[] blocks) {
         if (blocks.length == 1) {
             setCuboidRegion(x1, x2, y1, y2, z1, z2, blocks[0]);
-        }
-        else {
+        } else {
             for (int x = x1; x < x2; x++) {
                 for (int z = z1; z < z2; z++) {
                     for (int y = y1; y < y2; y++) {
@@ -227,8 +220,8 @@ public class WorldGenerator extends PlotGenerator {
     }
 
     /**
-     * This part is a fucking mess. - Refer to a proper tutorial if you would
-     * like to learn how to make a world generator
+     * This part is a fucking mess. - Refer to a proper tutorial if you would like to learn how to make a world
+     * generator
      */
     @Override
     public short[][] generateExtBlockSections(final World world, final Random random, int cx, int cz, final BiomeGrid biomes) {
@@ -245,8 +238,7 @@ public class WorldGenerator extends PlotGenerator {
         double pathWidthLower;
         if ((this.pathsize % 2) == 0) {
             pathWidthLower = Math.floor(this.pathsize / 2) - 1;
-        }
-        else {
+        } else {
             pathWidthLower = Math.floor(this.pathsize / 2);
         }
         cx = (cx % this.size) + (8 * this.size);
@@ -301,14 +293,12 @@ public class WorldGenerator extends PlotGenerator {
                 int start, end;
                 if ((plotMinX + 2) <= 16) {
                     start = 16 - plotMinX - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartX - 1) <= 16) {
                     end = (16 - roadStartX) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinX + 2) <= 16) || ((roadStartX - 1) <= 16))) {
@@ -322,14 +312,12 @@ public class WorldGenerator extends PlotGenerator {
                 int start, end;
                 if ((plotMinZ + 2) <= 16) {
                     start = 16 - plotMinZ - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartZ - 1) <= 16) {
                     end = (16 - roadStartZ) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinZ + 2) <= 16) || ((roadStartZ - 1) <= 16))) {
@@ -342,14 +330,12 @@ public class WorldGenerator extends PlotGenerator {
                 int start, end;
                 if ((plotMinX + 2) <= 16) {
                     start = 16 - plotMinX - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartX - 1) <= 16) {
                     end = (16 - roadStartX) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinX + 2) <= 16) || ((roadStartX - 1) <= 16))) {
@@ -362,14 +348,12 @@ public class WorldGenerator extends PlotGenerator {
                 int start, end;
                 if ((plotMinZ + 2) <= 16) {
                     start = 16 - plotMinZ - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartZ - 1) <= 16) {
                     end = (16 - roadStartZ) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinZ + 2) <= 16) || ((roadStartZ - 1) <= 16))) {
@@ -391,8 +375,7 @@ public class WorldGenerator extends PlotGenerator {
                     setCuboidRegion(0, 16 - roadStartX, 1, this.plotheight, 16 - plotMinZ, 16, this.filling);
                     setCuboidRegion(0, 16 - roadStartX, this.plotheight, this.plotheight + 1, 16 - plotMinZ, 16, this.plotfloors);
                 }
-            }
-            else {
+            } else {
                 if (roadStartZ <= 16) {
                     if (plotMinX > 16) {
                         setCuboidRegion(0, 16, 1, this.plotheight, 0, 16 - roadStartZ, this.filling);
@@ -404,8 +387,7 @@ public class WorldGenerator extends PlotGenerator {
                 if (plotMinZ <= 16) {
                     setCuboidRegion(16 - plotMinX, 16, 1, this.plotheight, 16 - plotMinZ, 16, this.filling);
                     setCuboidRegion(16 - plotMinX, 16, this.plotheight, this.plotheight + 1, 16 - plotMinZ, 16, this.plotfloors);
-                }
-                else {
+                } else {
                     int z = 16 - roadStartZ;
                     if (z < 0) {
                         z = 16;
@@ -416,8 +398,7 @@ public class WorldGenerator extends PlotGenerator {
                 if (roadStartZ <= 16) {
                     setCuboidRegion(16 - plotMinX, 16, 1, this.plotheight, 0, 16 - roadStartZ, this.filling);
                     setCuboidRegion(16 - plotMinX, 16, this.plotheight, this.plotheight + 1, 0, 16 - roadStartZ, this.plotfloors);
-                }
-                else {
+                } else {
                     if (roadStartX <= 16) {
                         if (plotMinZ > 16) {
                             int x = 16 - roadStartX;
@@ -429,8 +410,7 @@ public class WorldGenerator extends PlotGenerator {
                         }
                     }
                 }
-            }
-            else {
+            } else {
                 if (plotMinZ <= 16) {
                     if (roadStartX > 16) {
                         int x = 16 - roadStartX;
@@ -440,8 +420,7 @@ public class WorldGenerator extends PlotGenerator {
                         setCuboidRegion(0, x, 1, this.plotheight, 16 - plotMinZ, 16, this.filling);
                         setCuboidRegion(0, x, this.plotheight, this.plotheight + 1, 16 - plotMinZ, 16, this.plotfloors);
                     }
-                }
-                else {
+                } else {
                     if (roadStartZ > 16) {
                         int x = 16 - roadStartX;
                         if (x < 0) {
@@ -454,16 +433,14 @@ public class WorldGenerator extends PlotGenerator {
                         if (roadStartX > 16) {
                             setCuboidRegion(0, x, 1, this.plotheight, 0, z, this.filling);
                             setCuboidRegion(0, x, this.plotheight, this.plotheight + 1, 0, z, this.plotfloors);
-                        }
-                        else {
+                        } else {
                             setCuboidRegion(0, x, 1, this.plotheight, 0, z, this.filling);
                             setCuboidRegion(0, x, this.plotheight, this.plotheight + 1, 0, z, this.plotfloors);
                         }
                     }
                 }
             }
-        }
-        else {
+        } else {
             if (roadStartX <= 16) {
                 if (roadStartZ <= 16) {
                     setCuboidRegion(0, 16 - roadStartX, 1, this.plotheight, 0, 16 - roadStartZ, this.filling);
@@ -492,14 +469,12 @@ public class WorldGenerator extends PlotGenerator {
                 int start, end;
                 if ((plotMinX + 2) <= 16) {
                     start = 16 - plotMinX - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartX - 1) <= 16) {
                     end = (16 - roadStartX) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinX + 2) <= 16) || ((roadStartX - 1) <= 16))) {
@@ -514,14 +489,12 @@ public class WorldGenerator extends PlotGenerator {
                 int start, end;
                 if ((plotMinZ + 2) <= 16) {
                     start = 16 - plotMinZ - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartZ - 1) <= 16) {
                     end = (16 - roadStartZ) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinZ + 2) <= 16) || ((roadStartZ - 1) <= 16))) {
@@ -536,14 +509,12 @@ public class WorldGenerator extends PlotGenerator {
                 int start, end;
                 if ((plotMinX + 1) <= 16) {
                     start = 16 - plotMinX;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartX + 1) <= 16) {
                     end = (16 - roadStartX) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinX + 1) <= 16) || (roadStartX <= 16))) {
@@ -558,14 +529,12 @@ public class WorldGenerator extends PlotGenerator {
                 int start, end;
                 if ((plotMinZ + 1) <= 16) {
                     start = 16 - plotMinZ;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartZ + 1) <= 16) {
                     end = (16 - roadStartZ) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinZ + 1) <= 16) || ((roadStartZ + 1) <= 16))) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/XPopulator.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/XPopulator.java
index 90136ba34..341be3a7d 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/XPopulator.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/XPopulator.java
@@ -21,21 +21,19 @@
 
 package com.intellectualcrafters.plot.generator;
 
-import java.util.Random;
-
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.object.PlotWorld;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BlockPopulator;
 
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.object.PlotWorld;
+import java.util.Random;
 
 /**
  * @author Citymonstret
  */
-@SuppressWarnings("unused")
-public class XPopulator extends BlockPopulator {
+@SuppressWarnings("unused") public class XPopulator extends BlockPopulator {
 
     /*
      * Sorry, this isn't well documented at the moment.
@@ -43,24 +41,24 @@ public class XPopulator extends BlockPopulator {
      * information about how a BlockPopulator works.
      */
 
-    final int                      plotsize;
-    final int                      pathsize;
-    final PlotBlock                wall;
-    final PlotBlock                wallfilling;
-    final PlotBlock                floor1;
-    final PlotBlock                floor2;
-    final int                      size;
-    final int                      roadheight;
-    final int                      wallheight;
-    final int                      plotheight;
-    final PlotBlock[]              plotfloors;
-    final PlotBlock[]              filling;
+    final int plotsize;
+    final int pathsize;
+    final PlotBlock wall;
+    final PlotBlock wallfilling;
+    final PlotBlock floor1;
+    final PlotBlock floor2;
+    final int size;
+    final int roadheight;
+    final int wallheight;
+    final int plotheight;
+    final PlotBlock[] plotfloors;
+    final PlotBlock[] filling;
     private final DefaultPlotWorld plotworld;
-    final private double           pathWidthLower;
-    Biome                          biome;
-    private int                    X;
-    private int                    Z;
-    private long                   state;
+    final private double pathWidthLower;
+    Biome biome;
+    private int X;
+    private int Z;
+    private long state;
 
     public XPopulator(final PlotWorld pw) {
         this.plotworld = (DefaultPlotWorld) pw;
@@ -86,8 +84,7 @@ public class XPopulator extends BlockPopulator {
 
         if ((this.pathsize % 2) == 0) {
             this.pathWidthLower = Math.floor(this.pathsize / 2) - 1;
-        }
-        else {
+        } else {
             this.pathWidthLower = Math.floor(this.pathsize / 2);
         }
     }
@@ -126,8 +123,7 @@ public class XPopulator extends BlockPopulator {
     private void setCuboidRegion(final int x1, final int x2, final int y1, final int y2, final int z1, final int z2, final PlotBlock[] blocks, final World w) {
         if (blocks.length == 1) {
             setCuboidRegion(x1, x2, y1, y2, z1, z2, blocks[0], w);
-        }
-        else {
+        } else {
             for (int x = x1; x < x2; x++) {
                 for (int z = z1; z < z2; z++) {
                     for (int y = y1; y < y2; y++) {
@@ -145,9 +141,9 @@ public class XPopulator extends BlockPopulator {
     public short[] getBlock(final String block) {
         if (block.contains(":")) {
             final String[] split = block.split(":");
-            return new short[] { Short.parseShort(split[0]), Short.parseShort(split[1]) };
+            return new short[]{Short.parseShort(split[0]), Short.parseShort(split[1])};
         }
-        return new short[] { Short.parseShort(block), 0 };
+        return new short[]{Short.parseShort(block), 0};
     }
 
     @Override
@@ -207,14 +203,12 @@ public class XPopulator extends BlockPopulator {
                 int start, end;
                 if ((plotMinX + 2) <= 16) {
                     start = 16 - plotMinX - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartX - 1) <= 16) {
                     end = (16 - roadStartX) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinX + 2) <= 16) || ((roadStartX - 1) <= 16))) {
@@ -228,14 +222,12 @@ public class XPopulator extends BlockPopulator {
                 int start, end;
                 if ((plotMinZ + 2) <= 16) {
                     start = 16 - plotMinZ - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartZ - 1) <= 16) {
                     end = (16 - roadStartZ) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinZ + 2) <= 16) || ((roadStartZ - 1) <= 16))) {
@@ -248,14 +240,12 @@ public class XPopulator extends BlockPopulator {
                 int start, end;
                 if ((plotMinX + 2) <= 16) {
                     start = 16 - plotMinX - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartX - 1) <= 16) {
                     end = (16 - roadStartX) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinX + 2) <= 16) || ((roadStartX - 1) <= 16))) {
@@ -268,14 +258,12 @@ public class XPopulator extends BlockPopulator {
                 int start, end;
                 if ((plotMinZ + 2) <= 16) {
                     start = 16 - plotMinZ - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartZ - 1) <= 16) {
                     end = (16 - roadStartZ) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinZ + 2) <= 16) || ((roadStartZ - 1) <= 16))) {
@@ -291,14 +279,12 @@ public class XPopulator extends BlockPopulator {
                 int start, end;
                 if ((plotMinX + 2) <= 16) {
                     start = 16 - plotMinX - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartX - 1) <= 16) {
                     end = (16 - roadStartX) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinX + 2) <= 16) || ((roadStartX - 1) <= 16))) {
@@ -313,14 +299,12 @@ public class XPopulator extends BlockPopulator {
                 int start, end;
                 if ((plotMinZ + 2) <= 16) {
                     start = 16 - plotMinZ - 1;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartZ - 1) <= 16) {
                     end = (16 - roadStartZ) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinZ + 2) <= 16) || ((roadStartZ - 1) <= 16))) {
@@ -335,14 +319,12 @@ public class XPopulator extends BlockPopulator {
                 int start, end;
                 if ((plotMinX + 1) <= 16) {
                     start = 16 - plotMinX;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartX + 1) <= 16) {
                     end = (16 - roadStartX) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinX + 1) <= 16) || (roadStartX <= 16))) {
@@ -357,14 +339,12 @@ public class XPopulator extends BlockPopulator {
                 int start, end;
                 if ((plotMinZ + 1) <= 16) {
                     start = 16 - plotMinZ;
-                }
-                else {
+                } else {
                     start = 16;
                 }
                 if ((roadStartZ + 1) <= 16) {
                     end = (16 - roadStartZ) + 1;
-                }
-                else {
+                } else {
                     end = 0;
                 }
                 if (!(((plotMinZ + 1) <= 16) || ((roadStartZ + 1) <= 16))) {
@@ -389,8 +369,7 @@ public class XPopulator extends BlockPopulator {
                     setCuboidRegion(0, 16 - roadStartX, 1, this.plotheight, 16 - plotMinZ, 16, this.filling, w);
                     setCuboidRegion(0, 16 - roadStartX, this.plotheight, this.plotheight + 1, 16 - plotMinZ, 16, this.plotfloors, w);
                 }
-            }
-            else {
+            } else {
                 if (roadStartZ <= 16) {
                     if (plotMinX > 16) {
                         setCuboidRegion(0, 16, 1, this.plotheight, 0, 16 - roadStartZ, this.filling, w);
@@ -402,8 +381,7 @@ public class XPopulator extends BlockPopulator {
                 if (plotMinZ <= 16) {
                     setCuboidRegion(16 - plotMinX, 16, 1, this.plotheight, 16 - plotMinZ, 16, this.filling, w);
                     setCuboidRegion(16 - plotMinX, 16, this.plotheight, this.plotheight + 1, 16 - plotMinZ, 16, this.plotfloors, w);
-                }
-                else {
+                } else {
                     int z = 16 - roadStartZ;
                     if (z < 0) {
                         z = 16;
@@ -414,8 +392,7 @@ public class XPopulator extends BlockPopulator {
                 if (roadStartZ <= 16) {
                     setCuboidRegion(16 - plotMinX, 16, 1, this.plotheight, 0, 16 - roadStartZ, this.filling, w);
                     setCuboidRegion(16 - plotMinX, 16, this.plotheight, this.plotheight + 1, 0, 16 - roadStartZ, this.plotfloors, w);
-                }
-                else {
+                } else {
                     if (roadStartX <= 16) {
                         if (plotMinZ > 16) {
                             int x = 16 - roadStartX;
@@ -427,8 +404,7 @@ public class XPopulator extends BlockPopulator {
                         }
                     }
                 }
-            }
-            else {
+            } else {
                 if (plotMinZ <= 16) {
                     if (roadStartX > 16) {
                         int x = 16 - roadStartX;
@@ -438,8 +414,7 @@ public class XPopulator extends BlockPopulator {
                         setCuboidRegion(0, x, 1, this.plotheight, 16 - plotMinZ, 16, this.filling, w);
                         setCuboidRegion(0, x, this.plotheight, this.plotheight + 1, 16 - plotMinZ, 16, this.plotfloors, w);
                     }
-                }
-                else {
+                } else {
                     if (roadStartZ > 16) {
                         int x = 16 - roadStartX;
                         if (x < 0) {
@@ -452,16 +427,14 @@ public class XPopulator extends BlockPopulator {
                         if (roadStartX > 16) {
                             setCuboidRegion(0, x, 1, this.plotheight, 0, z, this.filling, w);
                             setCuboidRegion(0, x, this.plotheight, this.plotheight + 1, 0, z, this.plotfloors, w);
-                        }
-                        else {
+                        } else {
                             setCuboidRegion(0, x, 1, this.plotheight, 0, z, this.filling, w);
                             setCuboidRegion(0, x, this.plotheight, this.plotheight + 1, 0, z, this.plotfloors, w);
                         }
                     }
                 }
             }
-        }
-        else {
+        } else {
             if (roadStartX <= 16) {
                 if (roadStartZ <= 16) {
                     setCuboidRegion(0, 16 - roadStartX, 1, this.plotheight, 0, 16 - roadStartZ, this.filling, w);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/EntityListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/EntityListener.java
index b4e9f64c8..72dbfbec7 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/EntityListener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/EntityListener.java
@@ -1,16 +1,12 @@
 package com.intellectualcrafters.plot.listeners;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.PlotHelper;
+import org.bukkit.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -25,18 +21,16 @@ import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.event.world.ChunkUnloadEvent;
 import org.bukkit.scheduler.BukkitScheduler;
 
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Set;
 
 /**
  * @author Empire92
  */
-@SuppressWarnings({ "unused", "deprecation" })
-public class EntityListener implements Listener {
+@SuppressWarnings({"unused", "deprecation"}) public class EntityListener implements Listener {
 
     public final static HashMap>> entityMap = new HashMap<>();
 
@@ -75,7 +69,8 @@ public class EntityListener implements Listener {
                         final Location pos1 = PlotHelper.getPlotBottomLoc(world, plot.id).add(1, 0, 1);
                         final Location pos2 = PlotHelper.getPlotTopLoc(world, plot.id);
                         try {
-                            loops: for (int i = (pos1.getBlockX() / 16) * 16; i < (16 + ((pos2.getBlockX() / 16) * 16)); i += 16) {
+                            loops:
+                            for (int i = (pos1.getBlockX() / 16) * 16; i < (16 + ((pos2.getBlockX() / 16) * 16)); i += 16) {
                                 for (int j = (pos1.getBlockZ() / 16) * 16; j < (16 + ((pos2.getBlockZ() / 16) * 16)); j += 16) {
                                     final Chunk chunk = world.getChunkAt(i, j);
                                     if (chunk.isLoaded()) {
@@ -84,8 +79,7 @@ public class EntityListener implements Listener {
                                     }
                                 }
                             }
-                        }
-                        catch (final Exception e) {
+                        } catch (final Exception e) {
                             it.remove();
                             continue;
                         }
@@ -112,8 +106,7 @@ public class EntityListener implements Listener {
                         int mobs;
                         if (entityMap.get(n).containsKey(plot)) {
                             mobs = entityMap.get(n).get(plot).size();
-                        }
-                        else {
+                        } else {
                             mobs = 0;
                         }
                         if (!(PlotMain.hasPermissionRange(p, "plots.mobcap", Settings.MOB_CAP) > mobs)) {
@@ -178,8 +171,7 @@ public class EntityListener implements Listener {
                 if (entityMap.get(w).containsKey(plot)) {
                     entityMap.get(w).get(plot).remove(id);
                 }
-            }
-            else {
+            } else {
                 for (final Entry> n : entityMap.get(w).entrySet()) {
                     n.getValue().remove(id);
                 }
@@ -200,8 +192,7 @@ public class EntityListener implements Listener {
                                 if (entityMap.get(w).containsKey(plot)) {
                                     if (entityMap.get(w).get(plot).size() == 1) {
                                         entityMap.get(w).remove(plot);
-                                    }
-                                    else {
+                                    } else {
                                         entityMap.get(w).get(plot).remove(entity.getEntityId());
                                     }
                                 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/ForceFieldListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/ForceFieldListener.java
index 9d841f8ac..6760ee76e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/ForceFieldListener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/ForceFieldListener.java
@@ -21,9 +21,8 @@
 
 package com.intellectualcrafters.plot.listeners;
 
-import java.util.HashSet;
-import java.util.Set;
-
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -33,8 +32,8 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author Citymonstret
@@ -79,20 +78,17 @@ public class ForceFieldListener implements Listener {
         double x = 0d, y = 0d, z = 0d;
         if (playerX < oPlayerX) {
             x = 1.0d;
-        }
-        else if (playerX > oPlayerX) {
+        } else if (playerX > oPlayerX) {
             x = -1.0d;
         }
         if (playerY < oPlayerY) {
             y = 0.5d;
-        }
-        else if (playerY > oPlayerY) {
+        } else if (playerY > oPlayerY) {
             y = -0.5d;
         }
         if (playerZ < oPlayerZ) {
             z = 1.0d;
-        }
-        else if (playerZ > oPlayerZ) {
+        } else if (playerZ > oPlayerZ) {
             z = -1.0d;
         }
         return new Vector(x, y, z);
@@ -113,8 +109,7 @@ public class ForceFieldListener implements Listener {
                     for (final Player oPlayer : players) {
                         oPlayer.setVelocity(calculateVelocity(player, oPlayer));
                     }
-                }
-                else {
+                } else {
                     final Player oPlayer = hasNearbyPermitted(player, plot);
                     if (oPlayer == null) {
                         return;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/InventoryListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/InventoryListener.java
index 81a6eaac3..d100f6599 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/InventoryListener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/InventoryListener.java
@@ -1,5 +1,7 @@
 package com.intellectualcrafters.plot.listeners;
 
+import com.intellectualcrafters.plot.object.InfoInventory;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
@@ -8,16 +10,12 @@ import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryInteractEvent;
 import org.bukkit.inventory.Inventory;
 
-import com.intellectualcrafters.plot.object.InfoInventory;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-
 /**
  * Created 2014-11-18 for PlotSquared
  *
  * @author Citymonstret
  */
-@SuppressWarnings("unused")
-public class InventoryListener implements Listener {
+@SuppressWarnings("unused") public class InventoryListener implements Listener {
 
     @EventHandler
     public void onInventoryAction(final InventoryInteractEvent event) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
index 5c276decf..e8b273185 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
@@ -21,14 +21,15 @@
 
 package com.intellectualcrafters.plot.listeners;
 
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.commands.Setup;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.*;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.PlotHelper;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
@@ -38,18 +39,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.block.BlockFormEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockGrowEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.block.BlockSpreadEvent;
-import org.bukkit.event.block.EntityBlockFormEvent;
+import org.bukkit.event.block.*;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
@@ -57,31 +47,12 @@ import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerEggThrowEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.*;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.event.world.WorldLoadEvent;
 
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.commands.Setup;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotSelection;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.PlotHelper;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Player Events involving plots
@@ -89,8 +60,7 @@ import com.intellectualcrafters.plot.util.PlotHelper;
  * @author Citymonstret
  * @author Empire92
  */
-@SuppressWarnings("unused")
-public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotListener implements Listener {
+@SuppressWarnings("unused") public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotListener implements Listener {
 
     @EventHandler
     public static void onWorldLoad(final WorldLoadEvent event) {
@@ -107,8 +77,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
             if (Settings.TELEPORT_ON_LOGIN) {
                 event.getPlayer().teleport(PlotHelper.getPlotHomeDefault(getPlot(event.getPlayer())));
                 PlayerFunctions.sendMessage(event.getPlayer(), C.TELEPORTED_TO_ROAD);
-            }
-            else {
+            } else {
                 plotEntry(event.getPlayer(), getCurrentPlot(event.getPlayer().getLocation()));
             }
         }
@@ -134,14 +103,12 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                         return;
                     }
                     plotEntry(player, plot);
-                }
-                else if (leftPlot(f, q)) {
+                } else if (leftPlot(f, q)) {
                     final Plot plot = getCurrentPlot(event.getFrom());
                     plotExit(player, plot);
                 }
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             // Gotta catch 'em all.
         }
     }
@@ -211,7 +178,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public static void onPeskyMobsChangeTheWorldLikeWTFEvent( // LOL!
-            final EntityChangeBlockEvent event) {
+                                                                    final EntityChangeBlockEvent event) {
         final World world = event.getBlock().getWorld();
         if (!isPlotWorld(world)) {
             return;
@@ -221,23 +188,20 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
             if (!(e instanceof org.bukkit.entity.FallingBlock)) {
                 event.setCancelled(true);
             }
-        }
-        else {
+        } else {
             final Block b = event.getBlock();
             final Player p = (Player) e;
             if (!isInPlot(b.getLocation())) {
                 if (!PlotMain.hasPermission(p, "plots.admin")) {
                     event.setCancelled(true);
                 }
-            }
-            else {
+            } else {
                 final Plot plot = getCurrentPlot(b.getLocation());
                 if (plot == null) {
                     if (!PlotMain.hasPermission(p, "plots.admin")) {
                         event.setCancelled(true);
                     }
-                }
-                else if (!plot.hasRights(p)) {
+                } else if (!plot.hasRights(p)) {
                     if (!PlotMain.hasPermission(p, "plots.admin")) {
                         event.setCancelled(true);
                     }
@@ -452,11 +416,9 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
         final CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
         if ((reason == CreatureSpawnEvent.SpawnReason.SPAWNER_EGG) && pW.SPAWN_EGGS) {
             return;
-        }
-        else if ((reason == CreatureSpawnEvent.SpawnReason.BREEDING) && pW.SPAWN_BREEDING) {
+        } else if ((reason == CreatureSpawnEvent.SpawnReason.BREEDING) && pW.SPAWN_BREEDING) {
             return;
-        }
-        else if ((reason == CreatureSpawnEvent.SpawnReason.CUSTOM) && pW.SPAWN_CUSTOM) {
+        } else if ((reason == CreatureSpawnEvent.SpawnReason.CUSTOM) && pW.SPAWN_CUSTOM) {
             return;
         }
         if (event.getEntity() instanceof Player) {
@@ -473,14 +435,11 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
 
         if (e.getBlock() != null) {
             world = e.getBlock().getWorld();
-        }
-        else if (e.getIgnitingEntity() != null) {
+        } else if (e.getIgnitingEntity() != null) {
             world = e.getIgnitingEntity().getWorld();
-        }
-        else if (e.getPlayer() != null) {
+        } else if (e.getPlayer() != null) {
             world = e.getPlayer().getWorld();
-        }
-        else {
+        } else {
             return;
         }
 
@@ -499,22 +458,19 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                     if (!PlotMain.hasPermission(p, "plots.admin")) {
                         e.setCancelled(true);
                     }
-                }
-                else {
+                } else {
                     final Plot plot = getCurrentPlot(b.getLocation());
                     if (plot == null) {
                         if (!PlotMain.hasPermission(p, "plots.admin")) {
                             e.setCancelled(true);
                         }
-                    }
-                    else if (!plot.hasRights(p)) {
+                    } else if (!plot.hasRights(p)) {
                         if (!PlotMain.hasPermission(p, "plots.admin")) {
                             e.setCancelled(true);
                         }
                     }
                 }
-            }
-            else {
+            } else {
                 e.setCancelled(true);
             }
         }
@@ -532,14 +488,12 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                 if (plot.deny_entry(event.getPlayer())) {
                     PlayerFunctions.sendMessage(event.getPlayer(), C.YOU_BE_DENIED);
                     event.setCancelled(true);
-                }
-                else {
+                } else {
                     if (enteredPlot(f, t)) {
                         plotEntry(event.getPlayer(), plot);
                     }
                 }
-            }
-            else {
+            } else {
                 if (leftPlot(f, t)) {
                     final Plot plot = getCurrentPlot(event.getFrom());
                     plotExit(event.getPlayer(), plot);
@@ -560,14 +514,12 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                 if (!isInPlot(b.getLocation())) {
                     PlayerFunctions.sendMessage(e.getPlayer(), C.NO_PLOT_PERMS);
                     e.setCancelled(true);
-                }
-                else {
+                } else {
                     final Plot plot = getCurrentPlot(b.getLocation());
                     if (plot == null) {
                         PlayerFunctions.sendMessage(e.getPlayer(), C.NO_PLOT_PERMS);
                         e.setCancelled(true);
-                    }
-                    else if (!plot.hasRights(e.getPlayer())) {
+                    } else if (!plot.hasRights(e.getPlayer())) {
                         PlayerFunctions.sendMessage(e.getPlayer(), C.NO_PLOT_PERMS);
                         e.setCancelled(true);
                     }
@@ -610,14 +562,12 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                 if (!isInPlot(b.getLocation())) {
                     PlayerFunctions.sendMessage(e.getPlayer(), C.NO_PLOT_PERMS);
                     e.setCancelled(true);
-                }
-                else {
+                } else {
                     final Plot plot = getCurrentPlot(b.getLocation());
                     if (plot == null) {
                         PlayerFunctions.sendMessage(e.getPlayer(), C.NO_PLOT_PERMS);
                         e.setCancelled(true);
-                    }
-                    else if (!plot.hasRights(e.getPlayer())) {
+                    } else if (!plot.hasRights(e.getPlayer())) {
                         PlayerFunctions.sendMessage(e.getPlayer(), C.NO_PLOT_PERMS);
                         e.setCancelled(true);
                     }
@@ -636,16 +586,14 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                     PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                     e.setCancelled(true);
                 }
-            }
-            else {
+            } else {
                 final Plot plot = getCurrentPlot(b.getLocation());
                 if (plot == null) {
                     if (!PlotMain.hasPermission(p, "plots.admin")) {
                         PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                         e.setCancelled(true);
                     }
-                }
-                else if (!plot.hasRights(p)) {
+                } else if (!plot.hasRights(p)) {
                     if (!PlotMain.hasPermission(p, "plots.admin")) {
                         PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                         e.setCancelled(true);
@@ -667,16 +615,14 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                         PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                         e.setCancelled(true);
                     }
-                }
-                else {
+                } else {
                     final Plot plot = getCurrentPlot(l);
                     if (plot == null) {
                         if (!PlotMain.hasPermission(p, "plots.admin")) {
                             PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                             e.setCancelled(true);
                         }
-                    }
-                    else if (!plot.hasRights(p)) {
+                    } else if (!plot.hasRights(p)) {
                         if (!PlotMain.hasPermission(p, "plots.admin")) {
                             PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                             e.setCancelled(true);
@@ -697,16 +643,14 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                     PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                     e.setCancelled(true);
                 }
-            }
-            else {
+            } else {
                 final Plot plot = getCurrentPlot(l);
                 if (plot == null) {
                     if (!PlotMain.hasPermission(p, "plots.admin")) {
                         PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                         e.setCancelled(true);
                     }
-                }
-                else if (!plot.hasRights(p)) {
+                } else if (!plot.hasRights(p)) {
                     if (!PlotMain.hasPermission(p, "plots.admin")) {
                         PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                         e.setCancelled(true);
@@ -728,8 +672,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                 final PlotWorld pW = getPlotWorld(l.getWorld());
                 if (!aPlr && pW.PVE && (!(a instanceof ItemFrame))) {
                     return;
-                }
-                else if (aPlr && pW.PVP) {
+                } else if (aPlr && pW.PVP) {
                     return;
                 }
                 if (!isInPlot(l)) {
@@ -737,8 +680,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                         PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                         e.setCancelled(true);
                     }
-                }
-                else {
+                } else {
                     final Plot plot = getCurrentPlot(l);
                     if (plot == null) {
                         if (!PlotMain.hasPermission(p, "plots.admin")) {
@@ -746,8 +688,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                             e.setCancelled(true);
                             return;
                         }
-                    }
-                    else if (aPlr && !booleanFlag(plot, "pvp")) {
+                    } else if (aPlr && !booleanFlag(plot, "pvp")) {
                         return;
                     }
                     if (!aPlr && !booleanFlag(plot, "pve")) {
@@ -775,16 +716,14 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
                     PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                     e.setHatching(false);
                 }
-            }
-            else {
+            } else {
                 final Plot plot = getCurrentPlot(l);
                 if (plot == null) {
                     if (!PlotMain.hasPermission(p, "plots.admin")) {
                         PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                         e.setHatching(false);
                     }
-                }
-                else if (!plot.hasRights(p)) {
+                } else if (!plot.hasRights(p)) {
                     if (!PlotMain.hasPermission(p, "plots.admin")) {
                         PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
                         e.setHatching(false);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java
index ff1e0fbd3..2e03adc71 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotListener.java
@@ -21,41 +21,30 @@
 
 package com.intellectualcrafters.plot.listeners;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.WeatherType;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent;
 import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent;
 import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.object.Title;
+import com.intellectualcrafters.plot.object.*;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.*;
+import org.bukkit.block.Biome;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.UUID;
 
 /**
  * @author Citymonstret
  * @author Empire92
  */
-@SuppressWarnings({ "unused", "deprecation" })
-public class PlotListener {
+@SuppressWarnings({"unused", "deprecation"}) public class PlotListener {
 
     public static void textures(final Player p) {
         if ((Settings.PLOT_SPECIFIC_RESOURCE_PACK.length() > 1) && isPlotWorld(p.getWorld())) {
@@ -138,8 +127,7 @@ public class PlotListener {
         str = str.toLowerCase();
         if (str.equals("rain")) {
             return WeatherType.DOWNFALL;
-        }
-        else {
+        } else {
             return WeatherType.CLEAR;
         }
     }
@@ -190,8 +178,7 @@ public class PlotListener {
                 try {
                     final Long time = Long.parseLong(plot.settings.getFlag("time").getValue());
                     player.setPlayerTime(time, true);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     plot.settings.setFlags(FlagManager.removeFlag(plot.settings.getFlags(), "time"));
                 }
             }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotPlusListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotPlusListener.java
index fc5cc82ea..6de24967d 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotPlusListener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotPlusListener.java
@@ -21,18 +21,13 @@
 
 package com.intellectualcrafters.plot.listeners;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Effect;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent;
+import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.util.PlayerFunctions;
+import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.*;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -46,20 +41,14 @@ import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.events.PlayerEnterPlotEvent;
-import com.intellectualcrafters.plot.events.PlayerLeavePlotEvent;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.util.PlayerFunctions;
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import java.util.*;
 
 /**
  * Created 2014-10-30 for PlotSquared
  *
  * @author Citymonstret
  */
-@SuppressWarnings({ "deprecation", "unused" })
-public class PlotPlusListener extends PlotListener implements Listener {
+@SuppressWarnings({"deprecation", "unused"}) public class PlotPlusListener extends PlotListener implements Listener {
 
     private final static HashMap feedRunnable = new HashMap<>();
     private final static HashMap healRunnable = new HashMap<>();
@@ -244,7 +233,7 @@ public class PlotPlusListener extends PlotListener implements Listener {
         public final int interval;
         public final int amount;
         public final int max;
-        public int       count = 0;
+        public int count = 0;
 
         public Interval(final int interval, final int amount, final int max) {
             this.interval = interval;
@@ -267,8 +256,8 @@ public class PlotPlusListener extends PlotListener implements Listener {
             }
         }
 
-        private final String                 name;
-        private final Material               material;
+        private final String name;
+        private final Material material;
 
         public RecordMeta(final String name, final Material material) {
             this.name = name;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
index ad3b88d05..e253ad171 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
@@ -21,6 +21,7 @@
 
 package com.intellectualcrafters.plot.listeners;
 
+<<<<<<< HEAD
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -42,6 +43,8 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerPortalEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
+=======
+>>>>>>> 73e92b834155ea9e458d7299ad78f4fd9b55aa66
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
@@ -57,17 +60,29 @@ import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.bukkit.selections.Selection;
 import com.sk89q.worldedit.function.mask.Mask;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.*;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author Citymonstret
  * @author Empire92
  */
-@SuppressWarnings("unused")
-public class WorldEditListener implements Listener {
+@SuppressWarnings("unused") public class WorldEditListener implements Listener {
 
-    final List       monitored      = Arrays.asList(new String[] { "set", "replace", "overlay", "walls", "outline", "deform", "hollow", "smooth", "move", "stack", "naturalize", "paste", "count", "regen", "copy", "cut", "" });
+    final List monitored = Arrays.asList(new String[]{"set", "replace", "overlay", "walls", "outline", "deform", "hollow", "smooth", "move", "stack", "naturalize", "paste", "count", "regen", "copy", "cut", ""});
 
-    public final Set blockedcmds    = new HashSet<>(Arrays.asList("/gmask", "//gmask", "/worldedit:gmask"));
+    public final Set blockedcmds = new HashSet<>(Arrays.asList("/gmask", "//gmask", "/worldedit:gmask"));
     public final Set restrictedcmds = new HashSet<>(Arrays.asList("/up", "//up", "/worldedit:up"));
 
     private boolean isPlotWorld(final Location l) {
@@ -135,8 +150,7 @@ public class WorldEditListener implements Listener {
                 e.setCancelled(true);
             }
             return;
-        }
-        else if (this.blockedcmds.contains(cmd)) {
+        } else if (this.blockedcmds.contains(cmd)) {
             e.setCancelled(true);
             return;
         }
@@ -180,8 +194,7 @@ public class WorldEditListener implements Listener {
         final Location l = p.getLocation();
         if (isPlotWorld(l)) {
             PWE.setMask(p, l);
-        }
-        else {
+        } else {
             PWE.removeMask(p);
         }
     }
@@ -240,8 +253,7 @@ public class WorldEditListener implements Listener {
         if (!isPlotWorld(q)) {
             if (isPlotWorld(f)) {
                 PWE.removeMask(p);
-            }
-            else {
+            } else {
                 return;
             }
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldGuardListener.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldGuardListener.java
index 6bb1559a5..e3ebf549b 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldGuardListener.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldGuardListener.java
@@ -21,19 +21,6 @@
 
 package com.intellectualcrafters.plot.listeners;
 
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.permissions.PermissionAttachment;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.events.PlayerClaimPlotEvent;
 import com.intellectualcrafters.plot.events.PlotDeleteEvent;
@@ -50,6 +37,18 @@ import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.permissions.PermissionAttachment;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * Created 2014-09-24 for PlotSquared
@@ -58,7 +57,7 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion;
  * @author Empire92
  */
 public class WorldGuardListener implements Listener {
-    public final ArrayList  str_flags;
+    public final ArrayList str_flags;
     public final ArrayList> flags;
 
     public WorldGuardListener(final PlotMain plugin) {
@@ -87,12 +86,10 @@ public class WorldGuardListener implements Listener {
             manager.getRegion(plot.id.x + "-" + plot.id.y);
             requester.performCommand("region setowner " + (plot.id.x + "-" + plot.id.y) + " " + UUIDHandler.getName(owner));
             requester.performCommand("region removeowner " + (plot.id.x + "-" + plot.id.y) + " " + UUIDHandler.getName(plot.getOwner()));
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             // requester.setOp(op);
 
-        }
-        finally {
+        } finally {
             add.remove();
             remove.remove();
         }
@@ -109,11 +106,9 @@ public class WorldGuardListener implements Listener {
                     requester.performCommand("region flag " + (plot.id.x + "-" + plot.id.y) + " " + key);
                 }
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             requester.setOp(op);
-        }
-        finally {
+        } finally {
             requester.setOp(op);
         }
     }
@@ -129,11 +124,9 @@ public class WorldGuardListener implements Listener {
                     requester.performCommand("region flag " + (plot.id.x + "-" + plot.id.y) + " " + key + " " + value);
                 }
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             requester.setOp(op);
-        }
-        finally {
+        } finally {
             requester.setOp(op);
         }
     }
@@ -205,8 +198,7 @@ public class WorldGuardListener implements Listener {
 
                 manager.addRegion(rg);
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             //
         }
     }
@@ -233,8 +225,7 @@ public class WorldGuardListener implements Listener {
             region.setOwners(owner);
 
             manager.addRegion(region);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             //
         }
     }
@@ -248,8 +239,7 @@ public class WorldGuardListener implements Listener {
 
             final RegionManager manager = PlotMain.worldGuard.getRegionManager(world);
             manager.removeRegion(plot.x + "-" + plot.y);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             //
         }
     }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java
index 531923332..435bf9d1d 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java
@@ -21,14 +21,12 @@
 
 package com.intellectualcrafters.plot.object;
 
+import com.sun.istack.internal.NotNull;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 
-import com.sun.istack.internal.NotNull;
-
 /**
- * Wrapper class for blocks, using
- * pure data rather than the object.
+ * Wrapper class for blocks, using pure data rather than the object.
  * 

  * Useful for NMS
  *
@@ -40,22 +38,22 @@ public class BlockWrapper {
     /**
      * X Coordinate
      */
-    public final int  x;
+    public final int x;
 
     /**
      * Y Coordinate
      */
-    public final int  y;
+    public final int y;
 
     /**
      * Z Coordinate
      */
-    public final int  z;
+    public final int z;
 
     /**
      * Block ID
      */
-    public final int  id;
+    public final int id;
 
     /**
      * Block Data Value
@@ -65,16 +63,11 @@ public class BlockWrapper {
     /**
      * Constructor
      *
-     * @param x
-     *            X Loc Value
-     * @param y
-     *            Y Loc Value
-     * @param z
-     *            Z Loc Value
-     * @param id
-     *            Material ID
-     * @param data
-     *            Data Value
+     * @param x    X Loc Value
+     * @param y    Y Loc Value
+     * @param z    Z Loc Value
+     * @param id   Material ID
+     * @param data Data Value
      */
     public BlockWrapper(final int x, final int y, final int z, final short id, final byte data) {
         this.x = x;
@@ -85,13 +78,11 @@ public class BlockWrapper {
     }
 
     /**
-     * Alternative Constructor
-     * Uses block data, rather than typed data
+     * Alternative Constructor Uses block data, rather than typed data
      *
-     * @param block
-     *            Block from which we get the data
+     * @param block Block from which we get the data
      */
-    @SuppressWarnings({ "deprecation", "unused" })
+    @SuppressWarnings({"deprecation", "unused"})
     public BlockWrapper(@NotNull final Block block) {
         this.x = block.getX();
         this.y = block.getY();
@@ -103,11 +94,11 @@ public class BlockWrapper {
     /**
      * Get a block based on the block wrapper
      *
-     * @param world
-     *            World in which the block is/will be, located
+     * @param world World in which the block is/will be, located
+     *
      * @return block created/fetched from settings
      */
-    @SuppressWarnings({ "unused", "deprecation" })
+    @SuppressWarnings({"unused", "deprecation"})
     public Block toBlock(@NotNull final World world) {
         final Block block = world.getBlockAt(this.x, this.y, this.z);
         block.setTypeIdAndData(this.id, this.data, true);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/InfoInventory.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/InfoInventory.java
index 6834171d3..868347a02 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/InfoInventory.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/InfoInventory.java
@@ -1,8 +1,6 @@
 package com.intellectualcrafters.plot.object;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.intellectualcrafters.plot.util.UUIDHandler;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -12,7 +10,8 @@ import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import com.intellectualcrafters.plot.util.UUIDHandler;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created 2014-11-18 for PlotSquared
@@ -21,15 +20,14 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
  */
 public class InfoInventory implements InventoryHolder {
 
-    private final Plot      plot;
+    private final Plot plot;
     private final Inventory inventory;
-    private final Player    player;
+    private final Player player;
 
     /**
      * Constructor
      *
-     * @param plot
-     *            from which we take information
+     * @param plot from which we take information
      */
     public InfoInventory(final Plot plot, final Player player) {
         this.plot = plot;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/Plot.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/Plot.java
index cfe1cd895..763126a79 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/Plot.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/Plot.java
@@ -21,19 +21,18 @@
 
 package com.intellectualcrafters.plot.object;
 
-import java.util.ArrayList;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.block.Biome;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.UUID;
 
 /**
  * The plot class
@@ -41,25 +40,24 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
  * @author Citymonstret
  * @author Empire92
  */
-@SuppressWarnings("javadoc")
-public class Plot implements Cloneable {
+@SuppressWarnings("javadoc") public class Plot implements Cloneable {
 
     /**
      * plot ID
      */
-    public final PlotId    id;
+    public final PlotId id;
     /**
      * plot world
      */
-    public final String    world;
+    public final String world;
     /**
      * plot owner
      */
-    public UUID            owner;
+    public UUID owner;
     /**
      * Deny Entry
      */
-    public boolean         deny_entry;
+    public boolean deny_entry;
     /**
      * List of helpers (with plot permissions)
      */
@@ -75,16 +73,16 @@ public class Plot implements Cloneable {
     /**
      * External settings class
      */
-    public PlotSettings    settings;
+    public PlotSettings settings;
     /**
      * Delete on next save cycle?
      */
-    public boolean         delete;
+    public boolean delete;
     /**
      * Has the plot changed since the last save cycle?
      */
-    public boolean         hasChanged       = false;
-    public boolean         countsTowardsMax = true;
+    public boolean hasChanged = false;
+    public boolean countsTowardsMax = true;
 
     /**
      * Primary constructor
@@ -94,6 +92,7 @@ public class Plot implements Cloneable {
      * @param plotBiome
      * @param helpers
      * @param denied
+     *
      * @deprecated
      */
     @Deprecated
@@ -145,6 +144,7 @@ public class Plot implements Cloneable {
      * @param helpers
      * @param denied
      * @param merged
+     *
      * @deprecated
      */
     @Deprecated
@@ -163,8 +163,7 @@ public class Plot implements Cloneable {
         this.delete = false;
         if (flags != null) {
             this.settings.setFlags(flags);
-        }
-        else {
+        } else {
             this.settings.setFlags(new Flag[0]);
         }
         this.world = world;
@@ -193,8 +192,7 @@ public class Plot implements Cloneable {
         this.delete = false;
         if (flags != null) {
             this.settings.setFlags(flags);
-        }
-        else {
+        } else {
             this.settings.setFlags(new Flag[0]);
         }
         this.world = world;
@@ -213,6 +211,7 @@ public class Plot implements Cloneable {
      * Check if the player is either the owner or on the helpers list
      *
      * @param player
+     *
      * @return true if the player is added as a helper or is the owner
      */
     public boolean hasRights(final Player player) {
@@ -223,6 +222,7 @@ public class Plot implements Cloneable {
      * Should the player be allowed to enter?
      *
      * @param player
+     *
      * @return false if the player is allowed to enter
      */
     public boolean deny_entry(final Player player) {
@@ -342,8 +342,7 @@ public class Plot implements Cloneable {
     /**
      * Clear a plot
      *
-     * @param plr
-     *            initiator
+     * @param plr initiator
      */
     public void clear(final Player plr, final boolean isDelete) {
         PlotHelper.clear(plr, this, isDelete);
@@ -367,11 +366,8 @@ public class Plot implements Cloneable {
     /**
      * Get the plot hashcode
      *
-     * @return integer. You can easily make this a character array 

-     *         xI = c[0]
-     *         x = c[1 -> xI...]
-     *         yI = c[xI ... + 1]
-     *         y = c[xI ... + 2 -> yI ...]
+     * @return integer. You can easily make this a character array 
 xI = c[0] x = c[1 -> xI...] yI = c[xI ... + 1] y
+     * = c[xI ... + 2 -> yI ...]
      */
     @Override
     public int hashCode() {
@@ -380,18 +376,15 @@ public class Plot implements Cloneable {
         if (x >= 0) {
             if (y >= 0) {
                 return (x * x) + (3 * x) + (2 * x * y) + y + (y * y);
-            }
-            else {
+            } else {
                 final int y1 = -y;
                 return (x * x) + (3 * x) + (2 * x * y1) + y1 + (y1 * y1) + 1;
             }
-        }
-        else {
+        } else {
             final int x1 = -x;
             if (y >= 0) {
                 return -((x1 * x1) + (3 * x1) + (2 * x1 * y) + y + (y * y));
-            }
-            else {
+            } else {
                 final int y1 = -y;
                 return -((x1 * x1) + (3 * x1) + (2 * x1 * y1) + y1 + (y1 * y1) + 1);
             }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java
index 4fd8a68e9..63374b020 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java
@@ -26,7 +26,7 @@ package com.intellectualcrafters.plot.object;
  */
 public class PlotBlock {
     public final short id;
-    public final byte  data;
+    public final byte data;
 
     public PlotBlock(final short id, final byte data) {
         this.id = id;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotComment.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotComment.java
index 91026bbf0..1472435bb 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotComment.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotComment.java
@@ -26,7 +26,7 @@ package com.intellectualcrafters.plot.object;
  */
 public class PlotComment {
     public final String comment;
-    public final int    tier;
+    public final int tier;
     public final String senderName;
 
     public PlotComment(final String comment, final String senderName, final int tier) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java
index 73935683e..0d319045e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotGenerator.java
@@ -21,9 +21,8 @@
 
 package com.intellectualcrafters.plot.object;
 
-import org.bukkit.generator.ChunkGenerator;
-
 import com.intellectualcrafters.plot.PlotMain;
+import org.bukkit.generator.ChunkGenerator;
 
 public abstract class PlotGenerator extends ChunkGenerator {
 
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotHomePosition.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotHomePosition.java
index a880dd436..921324cc0 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotHomePosition.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotHomePosition.java
@@ -29,7 +29,7 @@ public enum PlotHomePosition {
     DEFAULT("Default", 'd');
 
     private final String string;
-    private final char   ch;
+    private final char ch;
 
     PlotHomePosition(final String string, final char ch) {
         this.string = string;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotId.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotId.java
index 39d5d6c56..38f0e9c42 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotId.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotId.java
@@ -35,10 +35,8 @@ public class PlotId {
     /**
      * PlotId class (PlotId x,y values do not correspond to Block locations)
      *
-     * @param x
-     *            The plot x coordinate
-     * @param y
-     *            The plot y coordinate
+     * @param x The plot x coordinate
+     * @param y The plot y coordinate
      */
     public PlotId(final int x, final int y) {
         this.x = x;
@@ -48,8 +46,8 @@ public class PlotId {
     /**
      * Get a Plot Id based on a string
      *
-     * @param string
-     *            to create id from
+     * @param string to create id from
+     *
      * @return null if the string is invalid
      */
     public static PlotId fromString(final String string) {
@@ -61,8 +59,7 @@ public class PlotId {
         try {
             x = Integer.parseInt(parts[0]);
             y = Integer.parseInt(parts[1]);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return null;
         }
         return new PlotId(x, y);
@@ -93,18 +90,15 @@ public class PlotId {
         if (this.x >= 0) {
             if (this.y >= 0) {
                 return (this.x * this.x) + (3 * this.x) + (2 * this.x * this.y) + this.y + (this.y * this.y);
-            }
-            else {
+            } else {
                 final int y1 = -this.y;
                 return (this.x * this.x) + (3 * this.x) + (2 * this.x * y1) + y1 + (y1 * y1) + 1;
             }
-        }
-        else {
+        } else {
             final int x1 = -this.x;
             if (this.y >= 0) {
                 return -((x1 * x1) + (3 * x1) + (2 * x1 * this.y) + this.y + (this.y * this.y));
-            }
-            else {
+            } else {
                 final int y1 = -this.y;
                 return -((x1 * x1) + (3 * x1) + (2 * x1 * y1) + y1 + (y1 * y1) + 1);
             }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java
index ca0950efc..24493887b 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java
@@ -21,14 +21,13 @@
 
 package com.intellectualcrafters.plot.object;
 
-import java.util.ArrayList;
-
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 
-@SuppressWarnings("unused")
-public abstract class PlotManager {
+import java.util.ArrayList;
+
+@SuppressWarnings("unused") public abstract class PlotManager {
 
     /*
      * Plot locations (methods with Abs in them will not need to consider mega
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotSelection.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotSelection.java
index ff22b3dd5..ddbc77125 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotSelection.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotSelection.java
@@ -21,33 +21,31 @@
 
 package com.intellectualcrafters.plot.object;
 
-import java.util.HashMap;
-
+import com.intellectualcrafters.plot.util.PlotHelper;
+import com.intellectualcrafters.plot.util.SetBlockFast;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.intellectualcrafters.plot.util.SetBlockFast;
+import java.util.HashMap;
 
 /**
  * Created 2014-10-12 for PlotSquared
  *
  * @author Citymonstret
  */
-@SuppressWarnings("deprecation")
-public class PlotSelection {
+@SuppressWarnings("deprecation") public class PlotSelection {
 
     public final static HashMap currentSelection = new HashMap<>();
 
-    private final PlotBlock[]                          plotBlocks;
+    private final PlotBlock[] plotBlocks;
 
-    private final int                                  width;
+    private final int width;
 
-    private final Plot                                 plot;
+    private final Plot plot;
 
-    private final Biome                                biome;
+    private final Biome biome;
 
     public PlotSelection(final int width, final World world, final Plot plot) {
         this.width = width;
@@ -101,21 +99,17 @@ public class PlotSelection {
                             try {
                                 SetBlockFast.set(world, b1.x, b1.y, b1.z, b2.id, b2.data);
                                 SetBlockFast.set(world, b2.x, b2.y, b2.z, b1.id, b1.data);
-                            }
-                            catch (final NoSuchMethodException e) {
+                            } catch (final NoSuchMethodException e) {
                                 PlotHelper.canSetFast = false;
                             }
-                        }
-                        else {
+                        } else {
                             if ((b1.id != b2.id) && (b1.data != b2.data)) {
                                 block1.setTypeIdAndData(b2.id, b2.data, false);
                                 block2.setTypeIdAndData(b1.id, b1.data, false);
-                            }
-                            else if (b1.id != b2.id) {
+                            } else if (b1.id != b2.id) {
                                 block1.setTypeId(b2.id);
                                 block2.setTypeId(b1.id);
-                            }
-                            else {
+                            } else {
                                 block1.setData(b2.data);
                                 block2.setData(b1.data);
                             }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java
index f9a46a09a..fea3eac00 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java
@@ -21,37 +21,35 @@
 
 package com.intellectualcrafters.plot.object;
 
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.util.PlotHelper;
+import com.sun.istack.internal.NotNull;
+import org.bukkit.block.Biome;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.bukkit.block.Biome;
-
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.util.PlotHelper;
-import com.sun.istack.internal.NotNull;
-
 /**
  * plot settings
  *
  * @author Citymonstret
  * @author Empire92
  */
-@SuppressWarnings("unused")
-public class PlotSettings {
+@SuppressWarnings("unused") public class PlotSettings {
     /**
      * Plot
      */
-    private final Plot             plot;
+    private final Plot plot;
     /**
      * merged plots
      */
-    private boolean[]              merged   = new boolean[] { false, false, false, false };
+    private boolean[] merged = new boolean[]{false, false, false, false};
     /**
      * plot alias
      */
-    private String                 alias;
+    private String alias;
     /**
      * Comments
      */
@@ -59,17 +57,16 @@ public class PlotSettings {
     /**
      * Flags
      */
-    private Set              flags;
+    private Set flags;
     /**
      * Home Position
      */
-    private PlotHomePosition       position;
+    private PlotHomePosition position;
 
     /**
      * Constructor
      *
-     * @param plot
-     *            object
+     * @param plot object
      */
     public PlotSettings(final Plot plot) {
         this.alias = "";
@@ -77,14 +74,10 @@ public class PlotSettings {
     }
 
     /**
-     * Check if the plot is merged in a direction

-     * 0 = North

-     * 1 = East

-     * 2 = South

-     * 3 = West

+     * Check if the plot is merged in a direction
 0 = North
 1 = East
 2 = South
 3 = West

+     *
+     * @param direction Direction to check
      *
-     * @param direction
-     *            Direction to check
      * @return boolean merged
      */
     public boolean getMerged(final int direction) {
@@ -118,8 +111,7 @@ public class PlotSettings {
     }
 
     /**
-     * @param flag
-     *            to add
+     * @param flag to add
      */
     public void addFlag(final Flag flag) {
         final Flag hasFlag = getFlag(flag.getKey());
@@ -141,8 +133,7 @@ public class PlotSettings {
     /**
      * Set multiple flags
      *
-     * @param flags
-     *            Flag Array
+     * @param flags Flag Array
      */
     public void setFlags(@NotNull final Flag[] flags) {
         this.flags = new HashSet<>(Arrays.asList(flags));
@@ -151,8 +142,8 @@ public class PlotSettings {
     /**
      * Get a flag
      *
-     * @param flag
-     *            Flag to get
+     * @param flag Flag to get
+     *
      * @return flag
      */
     public Flag getFlag(final String flag) {
@@ -179,8 +170,7 @@ public class PlotSettings {
     /**
      * Set the plot alias
      *
-     * @param alias
-     *            alias to be used
+     * @param alias alias to be used
      */
     public void setAlias(final String alias) {
         this.alias = alias;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
index f2b9993d1..d1f5aa939 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
@@ -21,45 +21,44 @@
 
 package com.intellectualcrafters.plot.object;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
+import com.intellectualcrafters.plot.config.Configuration;
+import com.intellectualcrafters.plot.config.ConfigurationNode;
 import org.bukkit.Material;
 import org.bukkit.block.Biome;
 import org.bukkit.configuration.ConfigurationSection;
 
-import com.intellectualcrafters.plot.config.Configuration;
-import com.intellectualcrafters.plot.config.ConfigurationNode;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * @author Jesse Boyd
  */
 public abstract class PlotWorld {
 
-    public final static boolean      AUTO_MERGE_DEFAULT              = false;
-    public final static boolean      MOB_SPAWNING_DEFAULT            = false;
-    public final static Biome        PLOT_BIOME_DEFAULT              = Biome.FOREST;
-    public final static boolean      PLOT_CHAT_DEFAULT               = false;
-    public final static boolean      SCHEMATIC_CLAIM_SPECIFY_DEFAULT = false;
-    public final static boolean      SCHEMATIC_ON_CLAIM_DEFAULT      = false;
-    public final static String       SCHEMATIC_FILE_DEFAULT          = "null";
-    public final static List SCHEMATICS_DEFAULT              = null;
-    public final static List DEFAULT_FLAGS_DEFAULT           = Arrays.asList();
-    public final static boolean      USE_ECONOMY_DEFAULT             = false;
-    public final static double       PLOT_PRICE_DEFAULT              = 100;
-    public final static double       MERGE_PRICE_DEFAULT             = 100;
-    public final static double       SELL_PRICE_DEFAULT              = 75;
-    public final static boolean      PVP_DEFAULT                     = false;
-    public final static boolean      PVE_DEFAULT                     = false;
-    public final static boolean      SPAWN_EGGS_DEFAULT              = false;
-    public final static boolean      SPAWN_CUSTOM_DEFAULT            = true;
-    public final static boolean      SPAWN_BREEDING_DEFAULT          = false;
+    public final static boolean AUTO_MERGE_DEFAULT = false;
+    public final static boolean MOB_SPAWNING_DEFAULT = false;
+    public final static Biome PLOT_BIOME_DEFAULT = Biome.FOREST;
+    public final static boolean PLOT_CHAT_DEFAULT = false;
+    public final static boolean SCHEMATIC_CLAIM_SPECIFY_DEFAULT = false;
+    public final static boolean SCHEMATIC_ON_CLAIM_DEFAULT = false;
+    public final static String SCHEMATIC_FILE_DEFAULT = "null";
+    public final static List SCHEMATICS_DEFAULT = null;
+    public final static List DEFAULT_FLAGS_DEFAULT = Arrays.asList();
+    public final static boolean USE_ECONOMY_DEFAULT = false;
+    public final static double PLOT_PRICE_DEFAULT = 100;
+    public final static double MERGE_PRICE_DEFAULT = 100;
+    public final static double SELL_PRICE_DEFAULT = 75;
+    public final static boolean PVP_DEFAULT = false;
+    public final static boolean PVE_DEFAULT = false;
+    public final static boolean SPAWN_EGGS_DEFAULT = false;
+    public final static boolean SPAWN_CUSTOM_DEFAULT = true;
+    public final static boolean SPAWN_BREEDING_DEFAULT = false;
     // TODO make this configurable
     // make non static and static_default_valu + add config option
     @SuppressWarnings("deprecation")
-    public static List     BLOCKS;                                           /*
+    public static List BLOCKS;                                           /*
      * =
      * new
      * ArrayList
@@ -263,25 +262,26 @@ public abstract class PlotWorld {
             }
         }
     }
-    public final String              worldname;
-    public boolean                   AUTO_MERGE;
-    public boolean                   MOB_SPAWNING;
-    public Biome                     PLOT_BIOME;
-    public boolean                   PLOT_CHAT;
-    public boolean                   SCHEMATIC_CLAIM_SPECIFY         = false;
-    public boolean                   SCHEMATIC_ON_CLAIM;
-    public String                    SCHEMATIC_FILE;
-    public List              SCHEMATICS;
-    public List              DEFAULT_FLAGS;
-    public boolean                   USE_ECONOMY;
-    public double                    PLOT_PRICE;
-    public double                    MERGE_PRICE;
-    public double                    SELL_PRICE;
-    public boolean                   PVP;
-    public boolean                   PVE;
-    public boolean                   SPAWN_EGGS;
-    public boolean                   SPAWN_CUSTOM;
-    public boolean                   SPAWN_BREEDING;
+
+    public final String worldname;
+    public boolean AUTO_MERGE;
+    public boolean MOB_SPAWNING;
+    public Biome PLOT_BIOME;
+    public boolean PLOT_CHAT;
+    public boolean SCHEMATIC_CLAIM_SPECIFY = false;
+    public boolean SCHEMATIC_ON_CLAIM;
+    public String SCHEMATIC_FILE;
+    public List SCHEMATICS;
+    public List DEFAULT_FLAGS;
+    public boolean USE_ECONOMY;
+    public double PLOT_PRICE;
+    public double MERGE_PRICE;
+    public double SELL_PRICE;
+    public boolean PVP;
+    public boolean PVE;
+    public boolean SPAWN_EGGS;
+    public boolean SPAWN_CUSTOM;
+    public boolean SPAWN_BREEDING;
 
     public PlotWorld(final String worldname) {
         this.worldname = worldname;
@@ -290,8 +290,7 @@ public abstract class PlotWorld {
     /**
      * When a world is created, the following method will be called for each
      *
-     * @param config
-     *            Configuration Section
+     * @param config Configuration Section
      */
     public void loadDefaultConfiguration(final ConfigurationSection config) {
         this.MOB_SPAWNING = config.getBoolean("natural_mob_spawning");
@@ -320,8 +319,7 @@ public abstract class PlotWorld {
     /**
      * Saving core plotworld settings
      *
-     * @param config
-     *            Configuration Section
+     * @param config Configuration Section
      */
     public void saveConfiguration(final ConfigurationSection config) {
         final HashMap options = new HashMap<>();
@@ -360,8 +358,7 @@ public abstract class PlotWorld {
     }
 
     /**
-     * Used for the /plot setup command Return null if you do not want to
-     * support this feature
+     * Used for the /plot setup command Return null if you do not want to support this feature
      *
      * @return ConfigurationNode[]
      */
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java
index 631190fee..da0031f31 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java
@@ -32,8 +32,7 @@ public class StringWrapper {
     /**
      * Constructor
      *
-     * @param value
-     *            to wrap
+     * @param value to wrap
      */
     public StringWrapper(final String value) {
         this.value = value;
@@ -42,8 +41,8 @@ public class StringWrapper {
     /**
      * Check if a wrapped string equals another one
      *
-     * @param obj
-     *            to compare
+     * @param obj to compare
+     *
      * @return true if obj equals the stored value
      */
     @Override
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/Title.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/Title.java
index 97562b6ec..2432d0e40 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/Title.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/object/Title.java
@@ -21,23 +21,22 @@
 
 package com.intellectualcrafters.plot.object;
 
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
 /**
  * Minecraft 1.8 Title
  *
  * @author Maxim Van de Wynckel
  * @version 1.0.3
  */
-@SuppressWarnings("unused")
-public class Title {
+@SuppressWarnings("unused") public class Title {
     private static final Map, Class> CORRESPONDING_TYPES;
 
     static {
@@ -45,28 +44,27 @@ public class Title {
     }
 
     /* Title packet */
-    private Class                             packetTitle;
+    private Class packetTitle;
     /* Title packet actions ENUM */
-    private Class                             packetActions;
+    private Class packetActions;
     /* Chat serializer */
-    private Class                             nmsChatSerializer;
+    private Class nmsChatSerializer;
     /* Title text and color */
-    private String                               title;
-    private ChatColor                            titleColor    = ChatColor.WHITE;
+    private String title;
+    private ChatColor titleColor = ChatColor.WHITE;
     /* Subtitle text and color */
-    private String                               subtitle      = "";
-    private ChatColor                            subtitleColor = ChatColor.WHITE;
+    private String subtitle = "";
+    private ChatColor subtitleColor = ChatColor.WHITE;
     /* Title timings */
-    private int                                  fadeInTime    = -1;
-    private int                                  stayTime      = -1;
-    private int                                  fadeOutTime   = -1;
-    private boolean                              ticks         = false;
+    private int fadeInTime = -1;
+    private int stayTime = -1;
+    private int fadeOutTime = -1;
+    private boolean ticks = false;
 
     /**
      * Create a new 1.8 title
      *
-     * @param title
-     *            Title
+     * @param title Title
      */
     public Title(final String title) {
         this.title = title;
@@ -76,10 +74,8 @@ public class Title {
     /**
      * Create a new 1.8 title
      *
-     * @param title
-     *            Title text
-     * @param subtitle
-     *            Subtitle text
+     * @param title    Title text
+     * @param subtitle Subtitle text
      */
     public Title(final String title, final String subtitle) {
         this.title = "";
@@ -91,16 +87,11 @@ public class Title {
     /**
      * Create a new 1.8 title
      *
-     * @param title
-     *            Title text
-     * @param subtitle
-     *            Subtitle text
-     * @param fadeInTime
-     *            Fade in time
-     * @param stayTime
-     *            Stay on screen time
-     * @param fadeOutTime
-     *            Fade out time
+     * @param title       Title text
+     * @param subtitle    Subtitle text
+     * @param fadeInTime  Fade in time
+     * @param stayTime    Stay on screen time
+     * @param fadeOutTime Fade out time
      */
     public Title(final String title, final String subtitle, final int fadeInTime, final int stayTime, final int fadeOutTime) {
         this.title = "";
@@ -136,8 +127,7 @@ public class Title {
     /**
      * Set the title color
      *
-     * @param color
-     *            Chat color
+     * @param color Chat color
      */
     public void setTitleColor(final ChatColor color) {
         this.titleColor = color;
@@ -146,8 +136,7 @@ public class Title {
     /**
      * Set the subtitle color
      *
-     * @param color
-     *            Chat color
+     * @param color Chat color
      */
     public void setSubtitleColor(final ChatColor color) {
         this.subtitleColor = color;
@@ -156,8 +145,7 @@ public class Title {
     /**
      * Set title fade in time
      *
-     * @param time
-     *            Time
+     * @param time Time
      */
     public void setFadeInTime(final int time) {
         this.fadeInTime = time;
@@ -166,8 +154,7 @@ public class Title {
     /**
      * Set title fade out time
      *
-     * @param time
-     *            Time
+     * @param time Time
      */
     public void setFadeOutTime(final int time) {
         this.fadeOutTime = time;
@@ -176,8 +163,7 @@ public class Title {
     /**
      * Set title stay time
      *
-     * @param time
-     *            Time
+     * @param time Time
      */
     public void setStayTime(final int time) {
         this.stayTime = time;
@@ -200,8 +186,7 @@ public class Title {
     /**
      * Send the title to a player
      *
-     * @param player
-     *            Player
+     * @param player Player
      */
     public void send(final Player player) {
         if ((getProtocolVersion(player) >= 47) && isSpigot() && (this.packetTitle != null)) {
@@ -229,8 +214,7 @@ public class Title {
                     packet = this.packetTitle.getConstructor(this.packetActions, getNMSClass("IChatBaseComponent")).newInstance(actions[1], serialized);
                     sendPacket.invoke(connection, packet);
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 e.printStackTrace();
             }
         }
@@ -248,8 +232,7 @@ public class Title {
     /**
      * Clear the title
      *
-     * @param player
-     *            Player
+     * @param player Player
      */
     public void clearTitle(final Player player) {
         if ((getProtocolVersion(player) >= 47) && isSpigot()) {
@@ -261,8 +244,7 @@ public class Title {
                 final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
                 final Object packet = this.packetTitle.getConstructor(this.packetActions).newInstance(actions[3]);
                 sendPacket.invoke(connection, packet);
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 e.printStackTrace();
             }
         }
@@ -271,8 +253,7 @@ public class Title {
     /**
      * Reset the title settings
      *
-     * @param player
-     *            Player
+     * @param player Player
      */
     public void resetTitle(final Player player) {
         if ((getProtocolVersion(player) >= 47) && isSpigot()) {
@@ -284,8 +265,7 @@ public class Title {
                 final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
                 final Object packet = this.packetTitle.getConstructor(this.packetActions).newInstance(actions[4]);
                 sendPacket.invoke(connection, packet);
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 e.printStackTrace();
             }
         }
@@ -294,8 +274,8 @@ public class Title {
     /**
      * Get the protocol version of the player
      *
-     * @param player
-     *            Player
+     * @param player Player
+     *
      * @return Protocol version
      */
     private int getProtocolVersion(final Player player) {
@@ -307,8 +287,7 @@ public class Title {
             version = (Integer) getMethod("getVersion", networkManager.getClass()).invoke(networkManager);
 
             return version;
-        }
-        catch (final Exception ex) {
+        } catch (final Exception ex) {
             // ex.printStackTrace(); <-- spammy console
         }
         return version;
@@ -326,15 +305,14 @@ public class Title {
     /**
      * Get class by url
      *
-     * @param namespace
-     *            Namespace url
+     * @param namespace Namespace url
+     *
      * @return Class
      */
     private Class getClass(final String namespace) {
         try {
             return Class.forName(namespace);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return null;
         }
     }
@@ -365,8 +343,7 @@ public class Title {
     private Object getHandle(final Object obj) {
         try {
             return getMethod("getHandle", obj.getClass()).invoke(obj);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             return null;
         }
@@ -393,8 +370,7 @@ public class Title {
         Class clazz = null;
         try {
             clazz = Class.forName(fullName);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
         }
         return clazz;
@@ -405,8 +381,7 @@ public class Title {
             final Field field = clazz.getDeclaredField(name);
             field.setAccessible(true);
             return field;
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             return null;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java
index 53dcd40d1..a1dedbd40 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java
@@ -26,8 +26,7 @@ import org.bukkit.ChatColor;
 public class ConsoleColors {
 
     public static String fromString(String input) {
-        input = input.replaceAll("&0", fromChatColor(ChatColor.BLACK)).replaceAll("&1", fromChatColor(ChatColor.DARK_BLUE)).replaceAll("&2", fromChatColor(ChatColor.DARK_GREEN)).replaceAll("&3", fromChatColor(ChatColor.DARK_AQUA)).replaceAll("&4", fromChatColor(ChatColor.DARK_RED)).replaceAll("&5", fromChatColor(ChatColor.DARK_PURPLE)).replaceAll("&6", fromChatColor(ChatColor.GOLD)).replaceAll("&7", fromChatColor(ChatColor.GRAY)).replaceAll("&8", fromChatColor(ChatColor.DARK_GRAY)).replaceAll("&9", fromChatColor(ChatColor.BLUE)).replaceAll("&a", fromChatColor(ChatColor.GREEN)).replaceAll("&b", fromChatColor(ChatColor.AQUA)).replaceAll("&c", fromChatColor(ChatColor.RED)).replaceAll("&d", fromChatColor(ChatColor.LIGHT_PURPLE)).replaceAll("&e", fromChatColor(ChatColor.YELLOW)).replaceAll("&f", fromChatColor(ChatColor.WHITE)).replaceAll("&k", fromChatColor(ChatColor.MAGIC)).replaceAll("&l", fromChatColor(ChatColor.BOLD)).replaceAll("&m", fromChatColor(ChatColor.STRIKETHROUGH))
-                .replaceAll("&n", fromChatColor(ChatColor.UNDERLINE)).replaceAll("&o", fromChatColor(ChatColor.ITALIC)).replaceAll("&r", fromChatColor(ChatColor.RESET));
+        input = input.replaceAll("&0", fromChatColor(ChatColor.BLACK)).replaceAll("&1", fromChatColor(ChatColor.DARK_BLUE)).replaceAll("&2", fromChatColor(ChatColor.DARK_GREEN)).replaceAll("&3", fromChatColor(ChatColor.DARK_AQUA)).replaceAll("&4", fromChatColor(ChatColor.DARK_RED)).replaceAll("&5", fromChatColor(ChatColor.DARK_PURPLE)).replaceAll("&6", fromChatColor(ChatColor.GOLD)).replaceAll("&7", fromChatColor(ChatColor.GRAY)).replaceAll("&8", fromChatColor(ChatColor.DARK_GRAY)).replaceAll("&9", fromChatColor(ChatColor.BLUE)).replaceAll("&a", fromChatColor(ChatColor.GREEN)).replaceAll("&b", fromChatColor(ChatColor.AQUA)).replaceAll("&c", fromChatColor(ChatColor.RED)).replaceAll("&d", fromChatColor(ChatColor.LIGHT_PURPLE)).replaceAll("&e", fromChatColor(ChatColor.YELLOW)).replaceAll("&f", fromChatColor(ChatColor.WHITE)).replaceAll("&k", fromChatColor(ChatColor.MAGIC)).replaceAll("&l", fromChatColor(ChatColor.BOLD)).replaceAll("&m", fromChatColor(ChatColor.STRIKETHROUGH)).replaceAll("&n", fromChatColor(ChatColor.UNDERLINE)).replaceAll("&o", fromChatColor(ChatColor.ITALIC)).replaceAll("&r", fromChatColor(ChatColor.RESET));
         return input + "\u001B[0m";
     }
 
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/LSetCube.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/LSetCube.java
index 20054e709..0d1a2e3d0 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/LSetCube.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/LSetCube.java
@@ -28,8 +28,7 @@ import org.bukkit.Location;
  *
  * @author Citymonstret
  */
-@SuppressWarnings({ "javadoc", "unused" })
-public class LSetCube {
+@SuppressWarnings({"javadoc", "unused"}) public class LSetCube {
 
     /**
      * Base locations
@@ -106,7 +105,7 @@ public class LSetCube {
         /**
          *
          */
-        private Location       current;
+        private Location current;
 
         /**
          * @param cube
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Lag.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Lag.java
index 62004a176..aab5b37cc 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Lag.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Lag.java
@@ -31,16 +31,16 @@ public class Lag implements Runnable {
     /**
      * Ticks
      */
-    public final static long[] T  = new long[600];
+    public final static long[] T = new long[600];
     /**
      * Tick count
      */
-    public static int          TC = 0;
+    public static int TC = 0;
     /**
      * something :_:
      */
     @SuppressWarnings("unused")
-    public static long         LT = 0L;
+    public static long LT = 0L;
 
     /**
      * Get the server TPS
@@ -54,8 +54,8 @@ public class Lag implements Runnable {
     /**
      * Return the tick per second (measured in $ticks)
      *
-     * @param ticks
-     *            Ticks
+     * @param ticks Ticks
+     *
      * @return ticks per second
      */
     public static double getTPS(final int ticks) {
@@ -70,8 +70,8 @@ public class Lag implements Runnable {
     /**
      * Get number of ticks since
      *
-     * @param tI
-     *            Ticks <
+     * @param tI Ticks <
+     *
      * @return number of ticks since $tI
      */
     @SuppressWarnings("unused")
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Logger.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Logger.java
index 3c0342e4f..df2d8ea2d 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Logger.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Logger.java
@@ -21,17 +21,13 @@
 
 package com.intellectualcrafters.plot.util;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Date;
+
 /**
  * Logging of errors and debug messages.
  *
@@ -40,7 +36,7 @@ import com.intellectualcrafters.plot.config.C;
 public class Logger {
 
     private static ArrayList entries;
-    private static File              log;
+    private static File log;
 
     public static void setup(final File file) {
         log = file;
@@ -52,8 +48,7 @@ public class Logger {
                 entries.add(line);
             }
             reader.close();
-        }
-        catch (final IOException e) {
+        } catch (final IOException e) {
             PlotMain.sendConsoleSenderMessage(C.PREFIX.s() + "File setup error Logger#setup");
         }
     }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Metrics.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Metrics.java
index c186b965e..d11437f20 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Metrics.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/Metrics.java
@@ -21,27 +21,6 @@
 
 package com.intellectualcrafters.plot.util;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -50,31 +29,41 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.scheduler.BukkitTask;
 
+import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.zip.GZIPOutputStream;
+
 public class Metrics {
     /**
      * The current revision number
      */
-    private final static int        REVISION      = 7;
+    private final static int REVISION = 7;
     /**
      * The base url of the metrics domain
      */
-    private static final String     BASE_URL      = "http://report.mcstats.org";
+    private static final String BASE_URL = "http://report.mcstats.org";
     /**
      * The url used to report a server's status
      */
-    private static final String     REPORT_URL    = "/plugin/%s";
+    private static final String REPORT_URL = "/plugin/%s";
     /**
      * Interval of time to ping (in minutes)
      */
-    private static final int        PING_INTERVAL = 15;
+    private static final int PING_INTERVAL = 15;
     /**
      * The plugin this metrics submits for
      */
-    private final Plugin            plugin;
+    private final Plugin plugin;
     /**
      * All of the custom graphs to submit to metrics
      */
-    private final Set        graphs        = Collections.synchronizedSet(new HashSet());
+    private final Set graphs = Collections.synchronizedSet(new HashSet());
     /**
      * The plugin configuration file
      */
@@ -82,23 +71,23 @@ public class Metrics {
     /**
      * The plugin configuration file
      */
-    private final File              configurationFile;
+    private final File configurationFile;
     /**
      * Unique server id
      */
-    private final String            guid;
+    private final String guid;
     /**
      * Debug mode
      */
-    private final boolean           debug;
+    private final boolean debug;
     /**
      * Lock for synchronization
      */
-    private final Object            optOutLock    = new Object();
+    private final Object optOutLock = new Object();
     /**
      * The scheduled task
      */
-    private volatile BukkitTask     task          = null;
+    private volatile BukkitTask task = null;
 
     public Metrics(final Plugin plugin) throws IOException {
         if (plugin == null) {
@@ -126,6 +115,7 @@ public class Metrics {
      * GZip compress a string of bytes
      *
      * @param input
+     *
      * @return
      */
     public static byte[] gzip(final String input) {
@@ -134,16 +124,13 @@ public class Metrics {
         try {
             gzos = new GZIPOutputStream(baos);
             gzos.write(input.getBytes("UTF-8"));
-        }
-        catch (final IOException e) {
+        } catch (final IOException e) {
             e.printStackTrace();
-        }
-        finally {
+        } finally {
             if (gzos != null) {
                 try {
                     gzos.close();
-                }
-                catch (final IOException ignore) {
+                } catch (final IOException ignore) {
                 }
             }
         }
@@ -156,6 +143,7 @@ public class Metrics {
      * @param json
      * @param key
      * @param value
+     *
      * @throws UnsupportedEncodingException
      */
     private static void appendJSONPair(final StringBuilder json, final String key, final String value) throws UnsupportedEncodingException {
@@ -165,8 +153,7 @@ public class Metrics {
                 Double.parseDouble(value);
                 isValueNumeric = true;
             }
-        }
-        catch (final NumberFormatException e) {
+        } catch (final NumberFormatException e) {
             isValueNumeric = false;
         }
         if (json.charAt(json.length() - 1) != '{') {
@@ -176,8 +163,7 @@ public class Metrics {
         json.append(':');
         if (isValueNumeric) {
             json.append(value);
-        }
-        else {
+        } else {
             json.append(escapeJSON(value));
         }
     }
@@ -186,6 +172,7 @@ public class Metrics {
      * Escape a string to create a valid JSON string
      *
      * @param text
+     *
      * @return
      */
     private static String escapeJSON(final String text) {
@@ -215,8 +202,7 @@ public class Metrics {
                     if (chr < ' ') {
                         final String t = "000" + Integer.toHexString(chr);
                         builder.append("\\u" + t.substring(t.length() - 4));
-                    }
-                    else {
+                    } else {
                         builder.append(chr);
                     }
                     break;
@@ -229,8 +215,8 @@ public class Metrics {
     /**
      * Encode text as UTF-8
      *
-     * @param text
-     *            the text to encode
+     * @param text the text to encode
+     *
      * @return the encoded text, as UTF-8
      */
     private static String urlEncode(final String text) throws UnsupportedEncodingException {
@@ -238,14 +224,12 @@ public class Metrics {
     }
 
     /**
-     * Construct and create a Graph that can be used to separate specific
-     * plotters to their own graphs on the metrics website. Plotters can be
-     * added to the graph object returned.
+     * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics
+     * website. Plotters can be added to the graph object returned.
      *
-     * @param name
-     *            The name of the graph
-     * @return Graph object created. Will never return NULL under normal
-     *         circumstances unless bad parameters are given
+     * @param name The name of the graph
+     *
+     * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
      */
     public Graph createGraph(final String name) {
         if (name == null) {
@@ -260,11 +244,9 @@ public class Metrics {
     }
 
     /**
-     * Add a Graph object to BukkitMetrics that represents data for the plugin
-     * that should be sent to the backend
+     * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend
      *
-     * @param graph
-     *            The name of the graph
+     * @param graph The name of the graph
      */
     public void addGraph(final Graph graph) {
         if (graph == null) {
@@ -274,10 +256,9 @@ public class Metrics {
     }
 
     /**
-     * Start measuring statistics. This will immediately create an async
-     * repeating task as the plugin and send the initial data to the metrics
-     * backend, and then after that it will post in increments of PING_INTERVAL
-     * * 1200 ticks.
+     * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the
+     * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200
+     * ticks.
      *
      * @return True if statistics measuring is running, otherwise false.
      */
@@ -328,8 +309,7 @@ public class Metrics {
                         // false
                         // Each post thereafter will be a ping
                         this.firstPost = false;
-                    }
-                    catch (final IOException e) {
+                    } catch (final IOException e) {
                         if (Metrics.this.debug) {
                             Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
                         }
@@ -350,14 +330,12 @@ public class Metrics {
             try {
                 // Reload the metrics file
                 this.configuration.load(getConfigFile());
-            }
-            catch (final IOException ex) {
+            } catch (final IOException ex) {
                 if (this.debug) {
                     Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
                 }
                 return true;
-            }
-            catch (final InvalidConfigurationException ex) {
+            } catch (final InvalidConfigurationException ex) {
                 if (this.debug) {
                     Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
                 }
@@ -368,8 +346,7 @@ public class Metrics {
     }
 
     /**
-     * Enables metrics for the server by setting "opt-out" to false in the
-     * config file and starting the metrics task.
+     * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
      *
      * @throws java.io.IOException
      */
@@ -391,8 +368,7 @@ public class Metrics {
     }
 
     /**
-     * Disables metrics for the server by setting "opt-out" to true in the
-     * config file and canceling the metrics task.
+     * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
      *
      * @throws java.io.IOException
      */
@@ -415,8 +391,7 @@ public class Metrics {
     }
 
     /**
-     * Gets the File object of the config file that should be used to store data
-     * such as the GUID and opt-out status
+     * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status
      *
      * @return the File object for the config file
      */
@@ -451,12 +426,10 @@ public class Metrics {
         try {
             if (Bukkit.class.getMethod("getOnlinePlayers", new Class[0]).getReturnType() == Collection.class) {
                 playersOnline = ((Collection) Bukkit.class.getMethod("getOnlinePlayers", new Class[0]).invoke(null, new Object[0])).size();
-            }
-            else {
+            } else {
                 playersOnline = ((Player[]) Bukkit.class.getMethod("getOnlinePlayers", new Class[0]).invoke(null, new Object[0])).length;
             }
-        }
-        catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
         }
 
         // END server software specific section -- all code below does not use
@@ -527,8 +500,7 @@ public class Metrics {
         // It does not reroute POST requests so we need to go around it
         if (isMineshafterPresent()) {
             connection = url.openConnection(Proxy.NO_PROXY);
-        }
-        else {
+        } else {
             connection = url.openConnection();
         }
         final byte[] uncompressed = json.toString().getBytes();
@@ -557,13 +529,11 @@ public class Metrics {
         if ((response == null) || response.startsWith("ERR") || response.startsWith("7")) {
             if (response == null) {
                 response = "null";
-            }
-            else if (response.startsWith("7")) {
+            } else if (response.startsWith("7")) {
                 response = response.substring(response.startsWith("7,") ? 2 : 1);
             }
             throw new IOException(response);
-        }
-        else {
+        } else {
             // Is this the first update this hour?
             if (response.equals("1") || response.contains("This is your first update this hour")) {
                 synchronized (this.graphs) {
@@ -578,8 +548,7 @@ public class Metrics {
     }
 
     /**
-     * Check if mineshafter is present. If it is, we need to bypass it to send
-     * POST requests
+     * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
      *
      * @return true if mineshafter is installed on the server
      */
@@ -587,8 +556,7 @@ public class Metrics {
         try {
             Class.forName("mineshafter.MineServer");
             return true;
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return false;
         }
     }
@@ -598,10 +566,10 @@ public class Metrics {
      */
     public static class Graph {
         /**
-         * The graph's name, alphanumeric and spaces only :) If it does not
-         * comply to the above when submitted, it is rejected
+         * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
+         * rejected
          */
-        private final String       name;
+        private final String name;
         /**
          * The set of plotters that are contained within this graph
          */
@@ -623,8 +591,7 @@ public class Metrics {
         /**
          * Add a plotter to the graph, which will be used to plot entries
          *
-         * @param plotter
-         *            the plotter to add to the graph
+         * @param plotter the plotter to add to the graph
          */
         public void addPlotter(final Plotter plotter) {
             this.plotters.add(plotter);
@@ -633,8 +600,7 @@ public class Metrics {
         /**
          * Remove a plotter from the graph
          *
-         * @param plotter
-         *            the plotter to remove from the graph
+         * @param plotter the plotter to remove from the graph
          */
         public void removePlotter(final Plotter plotter) {
             this.plotters.remove(plotter);
@@ -664,8 +630,7 @@ public class Metrics {
         }
 
         /**
-         * Called when the server owner decides to opt-out of BukkitMetrics
-         * while the server is running.
+         * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
          */
         protected void onOptOut() {
         }
@@ -690,20 +655,16 @@ public class Metrics {
         /**
          * Construct a plotter with a specific plot name
          *
-         * @param name
-         *            the name of the plotter to use, which will show up on the
-         *            website
+         * @param name the name of the plotter to use, which will show up on the website
          */
         public Plotter(final String name) {
             this.name = name;
         }
 
         /**
-         * Get the current value for the plotted point. Since this function
-         * defers to an external function it may or may not return immediately
-         * thus cannot be guaranteed to be thread friendly or safe. This
-         * function can be called from any thread so care should be taken when
-         * accessing resources that need to be synchronized.
+         * Get the current value for the plotted point. Since this function defers to an external function it may or may
+         * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called
+         * from any thread so care should be taken when accessing resources that need to be synchronized.
          *
          * @return the current value for the point to be plotted.
          */
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PWE.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PWE.java
index 5099cd910..18a768ceb 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PWE.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PWE.java
@@ -21,10 +21,6 @@
 
 package com.intellectualcrafters.plot.util;
 
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.Plot;
@@ -37,21 +33,22 @@ import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.mask.RegionMask;
 import com.sk89q.worldedit.regions.CuboidRegion;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
 
 /**
  * @author Citymonstret
  * @author Empire92
  */
-@SuppressWarnings("ALL")
-public class PWE {
+@SuppressWarnings("ALL") public class PWE {
 
     public static void setMask(final Player p, final Location l) {
         try {
             LocalSession s;
             if (PlotMain.worldEdit == null) {
                 s = WorldEdit.getInstance().getSession(p.getName());
-            }
-            else {
+            } else {
                 s = PlotMain.worldEdit.getSession(p);
             }
 
@@ -66,8 +63,7 @@ public class PWE {
                             removeMask(p, s);
                             return;
                         }
-                    }
-                    else {
+                    } else {
 
                         final World w = p.getWorld();
 
@@ -91,8 +87,7 @@ public class PWE {
                 final Vector p1 = new Vector(69, 69, 69), p2 = new Vector(69, 69, 69);
                 s.setMask(new RegionMask(new CuboidRegion(plr.getWorld(), p1, p2)));
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             // throw new
             // PlotSquaredException(PlotSquaredException.PlotError.MISSING_DEPENDENCY,
             // "WorldEdit == Null?");
@@ -109,15 +104,13 @@ public class PWE {
             LocalSession s;
             if (PlotMain.worldEdit == null) {
                 s = WorldEdit.getInstance().getSession(p.getName());
-            }
-            else {
+            } else {
                 s = PlotMain.worldEdit.getSession(p);
             }
             final BukkitPlayer plr = PlotMain.worldEdit.wrapPlayer(p);
             final Vector p1 = new Vector(69, 69, 69), p2 = new Vector(69, 69, 69);
             s.setMask(new RegionMask(new CuboidRegion(plr.getWorld(), p1, p2)));
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             //
         }
     }
@@ -132,13 +125,11 @@ public class PWE {
             LocalSession s;
             if (PlotMain.worldEdit == null) {
                 s = WorldEdit.getInstance().getSession(p.getName());
-            }
-            else {
+            } else {
                 s = PlotMain.worldEdit.getSession(p);
             }
             removeMask(p, s);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             // throw new
             // PlotSquaredException(PlotSquaredException.PlotError.MISSING_DEPENDENCY,
             // "WorldEdit == Null?");
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlayerFunctions.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlayerFunctions.java
index 2abbca33b..fed476eb3 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlayerFunctions.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlayerFunctions.java
@@ -21,19 +21,6 @@
 
 package com.intellectualcrafters.plot.util;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.util.ChatPaginator;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
@@ -41,18 +28,25 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotWorld;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.util.ChatPaginator;
+
+import java.util.*;
 
 /**
  * Functions involving players, plots and locations.
  *
  * @author Citymonstret
  */
-@SuppressWarnings("javadoc")
-public class PlayerFunctions {
+@SuppressWarnings("javadoc") public class PlayerFunctions {
 
     /**
-     * @param player
-     *            player
+     * @param player player
+     *
      * @return
      */
     public static boolean isInPlot(final Player player) {
@@ -60,8 +54,8 @@ public class PlayerFunctions {
     }
 
     /**
-     * @param plot
-     *            plot
+     * @param plot plot
+     *
      * @return
      */
     public static boolean hasExpired(final Plot plot) {
@@ -132,10 +126,10 @@ public class PlayerFunctions {
     }
 
     /**
-     * Returns the plot at a location (mega plots are not considered, all plots
-     * are treated as small plots)
+     * Returns the plot at a location (mega plots are not considered, all plots are treated as small plots)
      *
      * @param loc
+     *
      * @return
      */
     public static PlotId getPlotAbs(final Location loc) {
@@ -152,6 +146,7 @@ public class PlayerFunctions {
      * Returns the plot id at a location (mega plots are considered)
      *
      * @param loc
+     *
      * @return
      */
     public static PlotId getPlot(final Location loc) {
@@ -168,6 +163,7 @@ public class PlayerFunctions {
      * Returns the plot a player is currently in.
      *
      * @param player
+     *
      * @return
      */
     public static Plot getCurrentPlot(final Player player) {
@@ -193,6 +189,7 @@ public class PlayerFunctions {
      * Updates a given plot with another instance
      *
      * @param plot
+     *
      * @deprecated
      */
     @Deprecated
@@ -204,6 +201,7 @@ public class PlayerFunctions {
      * Get the plots for a player
      *
      * @param plr
+     *
      * @return
      */
     public static Set getPlayerPlots(final World world, final Player plr) {
@@ -218,6 +216,7 @@ public class PlayerFunctions {
      * Get the number of plots for a player
      *
      * @param plr
+     *
      * @return
      */
     public static int getPlayerPlotCount(final World world, final Player plr) {
@@ -235,6 +234,7 @@ public class PlayerFunctions {
      * Get the maximum number of plots a player is allowed
      *
      * @param p
+     *
      * @return
      */
     @SuppressWarnings("SuspiciousNameCombination")
@@ -244,6 +244,7 @@ public class PlayerFunctions {
 
     /**
      * @return PlotMain.getPlots();
+     *
      * @deprecated
      */
     @Deprecated
@@ -255,8 +256,7 @@ public class PlayerFunctions {
      * \\previous\\
      *
      * @param plr
-     * @param msg
-     *            Was used to wrap the chat client length (Packets out--)
+     * @param msg Was used to wrap the chat client length (Packets out--)
      */
     public static void sendMessageWrapped(final Player plr, String msg) {
         if (msg.length() > ChatPaginator.AVERAGE_CHAT_PAGE_WIDTH) {
@@ -276,20 +276,16 @@ public class PlayerFunctions {
     /**
      * Send a message to the player
      *
-     * @param plr
-     *            Player to recieve message
-     * @param msg
-     *            Message to send
-     * @return true
-     *         Can be used in things such as commands (return
-     *         PlayerFunctions.sendMessage(...))
+     * @param plr Player to recieve message
+     * @param msg Message to send
+     *
+     * @return true Can be used in things such as commands (return PlayerFunctions.sendMessage(...))
      */
     public static boolean sendMessage(final Player plr, final String msg) {
         if ((msg.length() > 0) && !msg.equals("")) {
             if (plr == null) {
                 PlotMain.sendConsoleSenderMessage(C.PREFIX.s() + msg);
-            }
-            else {
+            } else {
                 sendMessageWrapped(plr, ChatColor.translateAlternateColorCodes('&', C.PREFIX.s() + msg));
             }
         }
@@ -310,18 +306,16 @@ public class PlayerFunctions {
     /**
      * Send a message to the player
      *
-     * @param plr
-     *            Player to recieve message
-     * @param c
-     *            Caption to send
+     * @param plr Player to recieve message
+     * @param c   Caption to send
+     *
      * @return
      */
     public static boolean sendMessage(final Player plr, final C c, final String... args) {
         if (c.s().length() > 1) {
             if (plr == null) {
                 PlotMain.sendConsoleSenderMessage(c);
-            }
-            else {
+            } else {
                 String msg = c.s();
                 if ((args != null) && (args.length > 0)) {
                     for (final String str : args) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
index 4f05f111f..cd723ce27 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
@@ -21,20 +21,13 @@
 
 package com.intellectualcrafters.plot.util;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
-
+import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.listeners.PlotListener;
+import com.intellectualcrafters.plot.object.*;
 import net.milkbowl.vault.economy.Economy;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
@@ -42,35 +35,30 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.listeners.PlotListener;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.object.PlotHomePosition;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotWorld;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * plot functions
  *
  * @author Citymonstret
  */
-@SuppressWarnings({ "unused", "javadoc", "deprecation" })
-public class PlotHelper {
-    public final static HashMap runners      = new HashMap<>();
-    public static boolean                      canSetFast   = false;
-    public static boolean                      canSendChunk = false;
-    public static ArrayList            runners_p    = new ArrayList<>();
-    static long                                state        = 1;
+@SuppressWarnings({"unused", "javadoc", "deprecation"}) public class PlotHelper {
+    public final static HashMap runners = new HashMap<>();
+    public static boolean canSetFast = false;
+    public static boolean canSendChunk = false;
+    public static ArrayList runners_p = new ArrayList<>();
+    static long state = 1;
 
     /**
      * direction 0 = north, 1 = south, etc:
      *
      * @param id
      * @param direction
+     *
      * @return
      */
     public static PlotId getPlotIdRelative(final PlotId id, final int direction) {
@@ -93,6 +81,7 @@ public class PlotHelper {
      * @param plr
      * @param world
      * @param plotIds
+     *
      * @return
      */
     public static boolean mergePlots(final Player plr, final World world, final ArrayList plotIds) {
@@ -113,17 +102,14 @@ public class PlotHelper {
     }
 
     /**
-     * Completely merges a set of plots

-     * (There are no checks to make sure you supply the correct
-     * arguments)

-     * - Misuse of this method can result in unusable plots

-     * - the set of plots must belong to one owner and be rectangular

-     * - the plot array must be sorted in ascending order

-     * - Road will be removed where required

-     * - changes will be saved to DB

+     * Completely merges a set of plots
 (There are no checks to make sure you supply the correct
+     * arguments)
 - Misuse of this method can result in unusable plots
 - the set of plots must belong to one
+     * owner and be rectangular
 - the plot array must be sorted in ascending order
 - Road will be removed where
+     * required
 - changes will be saved to DB

      *
      * @param world
      * @param plotIds
+     *
      * @return boolean (success)
      */
     public static boolean mergePlots(final World world, final ArrayList plotIds) {
@@ -196,11 +182,8 @@ public class PlotHelper {
     }
 
     /**
-     * Merges 2 plots Removes the road inbetween 

-     * - Assumes the first plot parameter is lower 

-     * - Assumes neither are a Mega-plot 

-     * - Assumes plots are directly next to each other 

-     * - Saves to DB
+     * Merges 2 plots Removes the road inbetween 
 - Assumes the first plot parameter is lower 
 - Assumes neither
+     * are a Mega-plot 
 - Assumes plots are directly next to each other 
 - Saves to DB
      *
      * @param world
      * @param lesserPlot
@@ -216,8 +199,7 @@ public class PlotHelper {
                 greaterPlot.settings.setMerged(0, true);
                 manager.removeRoadSouth(plotworld, lesserPlot);
             }
-        }
-        else {
+        } else {
             if (!lesserPlot.settings.getMerged(1)) {
                 lesserPlot.settings.setMerged(1, true);
                 greaterPlot.settings.setMerged(3, true);
@@ -251,7 +233,7 @@ public class PlotHelper {
             return 0;
         }
         final long r = ((nextLong() >>> 32) * n) >> 32;
-            return (int) r;
+        return (int) r;
     }
 
     public static void removeSign(final World world, final Plot p) {
@@ -316,8 +298,7 @@ public class PlotHelper {
                 try {
                     SetBlockFast.set(block.getWorld(), block.getX(), block.getY(), block.getZ(), plotblock.id, plotblock.data);
                     return true;
-                }
-                catch (final Throwable e) {
+                } catch (final Throwable e) {
                     canSetFast = false;
                 }
             }
@@ -327,12 +308,10 @@ public class PlotHelper {
             if (block.getTypeId() != plotblock.id) {
                 block.setTypeId(plotblock.id);
             }
-        }
-        else {
+        } else {
             if (block.getTypeId() == plotblock.id) {
                 block.setData(plotblock.data);
-            }
-            else {
+            } else {
                 block.setTypeIdAndData(plotblock.id, plotblock.data, false);
             }
         }
@@ -673,9 +652,9 @@ public class PlotHelper {
     public static short[] getBlock(final String block) {
         if (block.contains(":")) {
             final String[] split = block.split(":");
-            return new short[] { Short.parseShort(split[0]), Short.parseShort(split[1]) };
+            return new short[]{Short.parseShort(split[0]), Short.parseShort(split[1])};
         }
-        return new short[] { Short.parseShort(block), 0 };
+        return new short[]{Short.parseShort(block), 0};
     }
 
     public static void clearAllEntities(final World world, final Plot plot, final boolean tile) {
@@ -688,8 +667,7 @@ public class PlotHelper {
                     final Player player = (Player) entity;
                     PlotMain.teleportPlayer(player, entity.getLocation(), plot);
                     PlotListener.plotExit(player, plot);
-                }
-                else {
+                } else {
                     entity.remove();
                 }
             }
@@ -775,8 +753,7 @@ public class PlotHelper {
                     }
                 }
             }
-        }
-        else {
+        } else {
             try {
                 for (int y = pos1.getBlockY(); y < pos2.getBlockY(); y++) {
                     for (int x = pos1.getBlockX(); x < pos2.getBlockX(); x++) {
@@ -788,8 +765,7 @@ public class PlotHelper {
                         }
                     }
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 //
             }
         }
@@ -813,8 +789,7 @@ public class PlotHelper {
                     }
                 }
             }
-        }
-        else {
+        } else {
             try {
                 for (int y = pos1.getBlockY(); y < pos2.getBlockY(); y++) {
                     for (int x = pos1.getBlockX(); x < pos2.getBlockX(); x++) {
@@ -828,8 +803,7 @@ public class PlotHelper {
                         }
                     }
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 //
             }
         }
@@ -847,8 +821,7 @@ public class PlotHelper {
                     }
                 }
             }
-        }
-        else {
+        } else {
             try {
                 for (int y = pos1.getBlockY(); y < pos2.getBlockY(); y++) {
                     for (int x = pos1.getBlockX(); x < pos2.getBlockX(); x++) {
@@ -860,8 +833,7 @@ public class PlotHelper {
                         }
                     }
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 //
             }
         }
@@ -910,10 +882,9 @@ public class PlotHelper {
     /**
      * Get plot home
      *
-     * @param w
-     *            World in which the plot is located
-     * @param plotid
-     *            Plot ID
+     * @param w      World in which the plot is located
+     * @param plotid Plot ID
+     *
      * @return Home Location
      */
     public static Location getPlotHome(final World w, final PlotId plotid) {
@@ -926,8 +897,7 @@ public class PlotHelper {
             final int z = bot.getBlockZ() - 2;
             final int y = getHeighestBlock(w, x, z);
             return new Location(w, x, y, z);
-        }
-        else {
+        } else {
             final Location bot = getPlotBottomLoc(w, plotid), top = getPlotTopLoc(w, plotid);
             final int x = top.getBlockX() - bot.getBlockX();
             final int z = top.getBlockZ() - bot.getBlockZ();
@@ -939,8 +909,8 @@ public class PlotHelper {
     /**
      * Retrieve the location of the default plot home position
      *
-     * @param plot
-     *            Plot
+     * @param plot Plot
+     *
      * @return the location
      */
     public static Location getPlotHomeDefault(final Plot plot) {
@@ -952,13 +922,12 @@ public class PlotHelper {
     /**
      * Get the plot home
      *
-     * @param w
-     *            World
-     * @param plot
-     *            Plot Object
+     * @param w    World
+     * @param plot Plot Object
+     *
      * @return Plot Home Location
-     * @see #getPlotHome(org.bukkit.World,
-     *      com.intellectualcrafters.plot.object.PlotId)
+     *
+     * @see #getPlotHome(org.bukkit.World, com.intellectualcrafters.plot.object.PlotId)
      */
     public static Location getPlotHome(final World w, final Plot plot) {
         return getPlotHome(w, plot.id);
@@ -967,10 +936,8 @@ public class PlotHelper {
     /**
      * Refresh the plot chunks
      *
-     * @param world
-     *            World in which the plot is located
-     * @param plot
-     *            Plot Object
+     * @param world World in which the plot is located
+     * @param plot  Plot Object
      */
     public static void refreshPlotChunks(final World world, final Plot plot) {
         final int bottomX = getPlotBottomLoc(world, plot.id).getBlockX();
@@ -990,16 +957,14 @@ public class PlotHelper {
                 if (canSendChunk) {
                     final Chunk chunk = world.getChunkAt(x, z);
                     chunks.add(chunk);
-                }
-                else {
+                } else {
                     world.refreshChunk(x, z);
                 }
             }
         }
         try {
             SendChunk.sendChunk(chunks);
-        }
-        catch (final Throwable e) {
+        } catch (final Throwable e) {
             canSendChunk = false;
             for (int x = minChunkX; x <= maxChunkX; x++) {
                 for (int z = minChunkZ; z <= maxChunkZ; z++) {
@@ -1010,12 +975,12 @@ public class PlotHelper {
     }
 
     /**
-     * Gets the top plot location of a plot (all plots are treated as small
-     * plots)
-     * - To get the top loc of a mega plot use getPlotTopLoc(...)
+     * Gets the top plot location of a plot (all plots are treated as small plots) - To get the top loc of a mega plot
+     * use getPlotTopLoc(...)
      *
      * @param world
      * @param id
+     *
      * @return
      */
     public static Location getPlotTopLocAbs(final World world, final PlotId id) {
@@ -1025,12 +990,12 @@ public class PlotHelper {
     }
 
     /**
-     * Gets the bottom plot location of a plot (all plots are treated as small
-     * plots)
-     * - To get the top loc of a mega plot use getPlotBottomLoc(...)
+     * Gets the bottom plot location of a plot (all plots are treated as small plots) - To get the top loc of a mega
+     * plot use getPlotBottomLoc(...)
      *
      * @param world
      * @param id
+     *
      * @return
      */
     public static Location getPlotBottomLocAbs(final World world, final PlotId id) {
@@ -1044,6 +1009,7 @@ public class PlotHelper {
      *
      * @param world
      * @param id
+     *
      * @return
      */
     public static int getPlotWidth(final World world, final PlotId id) {
@@ -1051,12 +1017,12 @@ public class PlotHelper {
     }
 
     /**
-     * Gets the top loc of a plot (if mega, returns top loc of that mega plot)
-     * - If you would like each plot treated as a small plot use
-     * getPlotTopLocAbs(...)
+     * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like each plot treated as
+     * a small plot use getPlotTopLocAbs(...)
      *
      * @param world
      * @param id
+     *
      * @return
      */
     public static Location getPlotTopLoc(final World world, PlotId id) {
@@ -1070,13 +1036,12 @@ public class PlotHelper {
     }
 
     /**
-     * Gets the bottom loc of a plot (if mega, returns bottom loc of that mega
-     * plot)
-     * - If you would like each plot treated as a small plot use
-     * getPlotBottomLocAbs(...)
+     * Gets the bottom loc of a plot (if mega, returns bottom loc of that mega plot) - If you would like each plot
+     * treated as a small plot use getPlotBottomLocAbs(...)
      *
      * @param world
      * @param id
+     *
      * @return
      */
     public static Location getPlotBottomLoc(final World world, PlotId id) {
@@ -1094,6 +1059,7 @@ public class PlotHelper {
      *
      * @param world
      * @param id
+     *
      * @return
      */
     public static Plot getPlot(final World world, final PlotId id) {
@@ -1110,6 +1076,7 @@ public class PlotHelper {
      * Returns the plot at a given location
      *
      * @param loc
+     *
      * @return
      */
     public static Plot getCurrentPlot(final Location loc) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/RUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/RUtils.java
index 6147337a6..5e3eb44f2 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/RUtils.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/RUtils.java
@@ -21,19 +21,17 @@
 
 package com.intellectualcrafters.plot.util;
 
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
 
 /**
  * Random utilities
  *
  * @author Citymonstret
  */
-@SuppressWarnings("unused")
-public class RUtils {
+@SuppressWarnings("unused") public class RUtils {
 
     /**
      * Get the total allocated ram
@@ -65,8 +63,8 @@ public class RUtils {
     /**
      * Get formatted time
      *
-     * @param sec
-     *            seconds
+     * @param sec seconds
+     *
      * @return formatted time
      */
     public static String formatTime(final double sec) {
@@ -84,8 +82,7 @@ public class RUtils {
     /**
      * Force textures on the client
      *
-     * @param p
-     *            texture to force
+     * @param p texture to force
      */
     public void forceTexture(final Player p) {
         p.setResourcePack(Settings.PLOT_SPECIFIC_RESOURCE_PACK);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java
index 76f932a34..fa80c1925 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java
@@ -21,6 +21,9 @@
 
 package com.intellectualcrafters.plot.util;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -29,28 +32,24 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-
 /**
  * @author DPOH-VAR
  * @version 1.0
  */
-@SuppressWarnings({ "UnusedDeclaration", "rawtypes" })
-public class ReflectionUtils {
+@SuppressWarnings({"UnusedDeclaration", "rawtypes"}) public class ReflectionUtils {
 
     /**
      * prefix of bukkit classes
      */
-    private static String  preClassB = "org.bukkit.craftbukkit";
+    private static String preClassB = "org.bukkit.craftbukkit";
     /**
      * prefix of minecraft classes
      */
-    private static String  preClassM = "net.minecraft.server";
+    private static String preClassM = "net.minecraft.server";
     /**
      * boolean value, TRUE if server uses forge or MCPC+
      */
-    private static boolean forge     = false;
+    private static boolean forge = false;
 
     /** check server version and class names */
     static {
@@ -74,8 +73,7 @@ public class ReflectionUtils {
                     final String verM = pas[3];
                     preClassM += "." + verM;
                 }
-            }
-            catch (final Exception ignored) {
+            } catch (final Exception ignored) {
             }
         }
     }
@@ -88,22 +86,21 @@ public class ReflectionUtils {
     }
 
     /**
-     * Get class for name. Replace {nms} to net.minecraft.server.V*. Replace
-     * {cb} to org.bukkit.craftbukkit.V*. Replace {nm} to net.minecraft
+     * Get class for name. Replace {nms} to net.minecraft.server.V*. Replace {cb} to org.bukkit.craftbukkit.V*. Replace
+     * {nm} to net.minecraft
+     *
+     * @param classes possible class paths
      *
-     * @param classes
-     *            possible class paths
      * @return RefClass object
-     * @throws RuntimeException
-     *             if no class found
+     *
+     * @throws RuntimeException if no class found
      */
     public static RefClass getRefClass(final String... classes) throws RuntimeException {
         for (String className : classes) {
             try {
                 className = className.replace("{cb}", preClassB).replace("{nms}", preClassM).replace("{nm}", "net.minecraft");
                 return getRefClass(Class.forName(className));
-            }
-            catch (final ClassNotFoundException ignored) {
+            } catch (final ClassNotFoundException ignored) {
             }
         }
         throw new RuntimeException("no class found");
@@ -112,8 +109,8 @@ public class ReflectionUtils {
     /**
      * get RefClass object by real class
      *
-     * @param clazz
-     *            class
+     * @param clazz class
+     *
      * @return RefClass based on passed class
      */
     public static RefClass getRefClass(final Class clazz) {
@@ -142,8 +139,8 @@ public class ReflectionUtils {
         /**
          * see {@link Class#isInstance(Object)}
          *
-         * @param object
-         *            the object to check
+         * @param object the object to check
+         *
          * @return true if object is an instance of this class
          */
         public boolean isInstance(final Object object) {
@@ -153,13 +150,12 @@ public class ReflectionUtils {
         /**
          * get existing method by name and types
          *
-         * @param name
-         *            name
-         * @param types
-         *            method parameters. can be Class or RefClass
+         * @param name  name
+         * @param types method parameters. can be Class or RefClass
+         *
          * @return RefMethod object
-         * @throws RuntimeException
-         *             if method not found
+         *
+         * @throws RuntimeException if method not found
          */
         public RefMethod getMethod(final String name, final Object... types) throws NoSuchMethodException {
             try {
@@ -168,22 +164,18 @@ public class ReflectionUtils {
                 for (final Object e : types) {
                     if (e instanceof Class) {
                         classes[i++] = (Class) e;
-                    }
-                    else if (e instanceof RefClass) {
+                    } else if (e instanceof RefClass) {
                         classes[i++] = ((RefClass) e).getRealClass();
-                    }
-                    else {
+                    } else {
                         classes[i++] = e.getClass();
                     }
                 }
                 try {
                     return new RefMethod(this.clazz.getMethod(name, classes));
-                }
-                catch (final NoSuchMethodException ignored) {
+                } catch (final NoSuchMethodException ignored) {
                     return new RefMethod(this.clazz.getDeclaredMethod(name, classes));
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 throw new RuntimeException(e);
             }
         }
@@ -191,11 +183,11 @@ public class ReflectionUtils {
         /**
          * get existing constructor by types
          *
-         * @param types
-         *            parameters. can be Class or RefClass
+         * @param types parameters. can be Class or RefClass
+         *
          * @return RefMethod object
-         * @throws RuntimeException
-         *             if constructor not found
+         *
+         * @throws RuntimeException if constructor not found
          */
         public RefConstructor getConstructor(final Object... types) {
             try {
@@ -204,22 +196,18 @@ public class ReflectionUtils {
                 for (final Object e : types) {
                     if (e instanceof Class) {
                         classes[i++] = (Class) e;
-                    }
-                    else if (e instanceof RefClass) {
+                    } else if (e instanceof RefClass) {
                         classes[i++] = ((RefClass) e).getRealClass();
-                    }
-                    else {
+                    } else {
                         classes[i++] = e.getClass();
                     }
                 }
                 try {
                     return new RefConstructor(this.clazz.getConstructor(classes));
-                }
-                catch (final NoSuchMethodException ignored) {
+                } catch (final NoSuchMethodException ignored) {
                     return new RefConstructor(this.clazz.getDeclaredConstructor(classes));
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 throw new RuntimeException(e);
             }
         }
@@ -227,11 +215,11 @@ public class ReflectionUtils {
         /**
          * find method by type parameters
          *
-         * @param types
-         *            parameters. can be Class or RefClass
+         * @param types parameters. can be Class or RefClass
+         *
          * @return RefMethod object
-         * @throws RuntimeException
-         *             if method not found
+         *
+         * @throws RuntimeException if method not found
          */
         public RefMethod findMethod(final Object... types) {
             final Class[] classes = new Class[types.length];
@@ -239,18 +227,17 @@ public class ReflectionUtils {
             for (final Object e : types) {
                 if (e instanceof Class) {
                     classes[t++] = (Class) e;
-                }
-                else if (e instanceof RefClass) {
+                } else if (e instanceof RefClass) {
                     classes[t++] = ((RefClass) e).getRealClass();
-                }
-                else {
+                } else {
                     classes[t++] = e.getClass();
                 }
             }
             final List methods = new ArrayList<>();
             Collections.addAll(methods, this.clazz.getMethods());
             Collections.addAll(methods, this.clazz.getDeclaredMethods());
-            findMethod: for (final Method m : methods) {
+            findMethod:
+            for (final Method m : methods) {
                 final Class[] methodTypes = m.getParameterTypes();
                 if (methodTypes.length != classes.length) {
                     continue;
@@ -268,11 +255,11 @@ public class ReflectionUtils {
         /**
          * find method by name
          *
-         * @param names
-         *            possible names of method
+         * @param names possible names of method
+         *
          * @return RefMethod object
-         * @throws RuntimeException
-         *             if method not found
+         *
+         * @throws RuntimeException if method not found
          */
         public RefMethod findMethodByName(final String... names) {
             final List methods = new ArrayList<>();
@@ -291,11 +278,11 @@ public class ReflectionUtils {
         /**
          * find method by return value
          *
-         * @param type
-         *            type of returned value
+         * @param type type of returned value
+         *
          * @return RefMethod
-         * @throws RuntimeException
-         *             if method not found
+         *
+         * @throws RuntimeException if method not found
          */
         public RefMethod findMethodByReturnType(final RefClass type) {
             return findMethodByReturnType(type.clazz);
@@ -304,11 +291,11 @@ public class ReflectionUtils {
         /**
          * find method by return value
          *
-         * @param type
-         *            type of returned value
+         * @param type type of returned value
+         *
          * @return RefMethod
-         * @throws RuntimeException
-         *             if method not found
+         *
+         * @throws RuntimeException if method not found
          */
         public RefMethod findMethodByReturnType(Class type) {
             if (type == null) {
@@ -328,11 +315,11 @@ public class ReflectionUtils {
         /**
          * find constructor by number of arguments
          *
-         * @param number
-         *            number of arguments
+         * @param number number of arguments
+         *
          * @return RefConstructor
-         * @throws RuntimeException
-         *             if constructor not found
+         *
+         * @throws RuntimeException if constructor not found
          */
         public RefConstructor findConstructor(final int number) {
             final List constructors = new ArrayList<>();
@@ -349,22 +336,20 @@ public class ReflectionUtils {
         /**
          * get field by name
          *
-         * @param name
-         *            field name
+         * @param name field name
+         *
          * @return RefField
-         * @throws RuntimeException
-         *             if field not found
+         *
+         * @throws RuntimeException if field not found
          */
         public RefField getField(final String name) {
             try {
                 try {
                     return new RefField(this.clazz.getField(name));
-                }
-                catch (final NoSuchFieldException ignored) {
+                } catch (final NoSuchFieldException ignored) {
                     return new RefField(this.clazz.getDeclaredField(name));
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 throw new RuntimeException(e);
             }
         }
@@ -372,11 +357,11 @@ public class ReflectionUtils {
         /**
          * find field by type
          *
-         * @param type
-         *            field type
+         * @param type field type
+         *
          * @return RefField
-         * @throws RuntimeException
-         *             if field not found
+         *
+         * @throws RuntimeException if field not found
          */
         public RefField findField(final RefClass type) {
             return findField(type.clazz);
@@ -385,11 +370,11 @@ public class ReflectionUtils {
         /**
          * find field by type
          *
-         * @param type
-         *            field type
+         * @param type field type
+         *
          * @return RefField
-         * @throws RuntimeException
-         *             if field not found
+         *
+         * @throws RuntimeException if field not found
          */
         public RefField findField(Class type) {
             if (type == null) {
@@ -442,8 +427,8 @@ public class ReflectionUtils {
         /**
          * apply method to object
          *
-         * @param e
-         *            object to which the method is applied
+         * @param e object to which the method is applied
+         *
          * @return RefExecutor with method call(...)
          */
         public RefExecutor of(final Object e) {
@@ -453,15 +438,14 @@ public class ReflectionUtils {
         /**
          * call static method
          *
-         * @param params
-         *            sent parameters
+         * @param params sent parameters
+         *
          * @return return value
          */
         public Object call(final Object... params) {
             try {
                 return this.method.invoke(null, params);
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 throw new RuntimeException(e);
             }
         }
@@ -476,17 +460,16 @@ public class ReflectionUtils {
             /**
              * apply method for selected object
              *
-             * @param params
-             *            sent parameters
+             * @param params sent parameters
+             *
              * @return return value
-             * @throws RuntimeException
-             *             if something went wrong
+             *
+             * @throws RuntimeException if something went wrong
              */
             public Object call(final Object... params) {
                 try {
                     return RefMethod.this.method.invoke(this.e, params);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     throw new RuntimeException(e);
                 }
             }
@@ -521,17 +504,16 @@ public class ReflectionUtils {
         /**
          * create new instance with constructor
          *
-         * @param params
-         *            parameters for constructor
+         * @param params parameters for constructor
+         *
          * @return new object
-         * @throws RuntimeException
-         *             if something went wrong
+         *
+         * @throws RuntimeException if something went wrong
          */
         public Object create(final Object... params) {
             try {
                 return this.constructor.newInstance(params);
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 throw new RuntimeException(e);
             }
         }
@@ -569,8 +551,8 @@ public class ReflectionUtils {
         /**
          * apply fiend for object
          *
-         * @param e
-         *            applied object
+         * @param e applied object
+         *
          * @return RefExecutor with getter and setter
          */
         public RefExecutor of(final Object e) {
@@ -587,14 +569,12 @@ public class ReflectionUtils {
             /**
              * set field value for applied object
              *
-             * @param param
-             *            value
+             * @param param value
              */
             public void set(final Object param) {
                 try {
                     RefField.this.field.set(this.e, param);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     throw new RuntimeException(e);
                 }
             }
@@ -607,8 +587,7 @@ public class ReflectionUtils {
             public Object get() {
                 try {
                     return RefField.this.field.get(this.e);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     throw new RuntimeException(e);
                 }
             }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
index c5d600258..5ecd8d917 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
@@ -21,36 +21,22 @@
 
 package com.intellectualcrafters.plot.util;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
+import com.intellectualcrafters.jnbt.*;
+import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 
-import com.intellectualcrafters.jnbt.ByteArrayTag;
-import com.intellectualcrafters.jnbt.CompoundTag;
-import com.intellectualcrafters.jnbt.IntTag;
-import com.intellectualcrafters.jnbt.ListTag;
-import com.intellectualcrafters.jnbt.NBTInputStream;
-import com.intellectualcrafters.jnbt.NBTOutputStream;
-import com.intellectualcrafters.jnbt.ShortTag;
-import com.intellectualcrafters.jnbt.StringTag;
-import com.intellectualcrafters.jnbt.Tag;
-import com.intellectualcrafters.plot.PlotMain;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.object.PlotId;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 /**
  * Schematic Handler
@@ -62,12 +48,10 @@ public class SchematicHandler {
     /**
      * Paste a schematic
      *
-     * @param location
-     *            origin
-     * @param schematic
-     *            schematic to paste
-     * @param plot
-     *            plot to paste in
+     * @param location  origin
+     * @param schematic schematic to paste
+     * @param plot      plot to paste in
+     *
      * @return true if succeeded
      */
     public static boolean paste(final Location location, final Schematic schematic, final Plot plot, final int x_offset, final int z_offset) {
@@ -95,8 +79,7 @@ public class SchematicHandler {
             int y_offset;
             if (HEIGHT == location.getWorld().getMaxHeight()) {
                 y_offset = 0;
-            }
-            else {
+            } else {
                 y_offset = l1.getBlockY();
             }
 
@@ -125,8 +108,7 @@ public class SchematicHandler {
                     }
                 }
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             return false;
         }
         return true;
@@ -135,8 +117,8 @@ public class SchematicHandler {
     /**
      * Get a schematic
      *
-     * @param name
-     *            to check
+     * @param name to check
+     *
      * @return schematic if found, else null
      */
     public static Schematic getSchematic(final String name) {
@@ -180,12 +162,10 @@ public class SchematicHandler {
                 if ((index >> 1) >= addId.length) { // No corresponding
                     // AddBlocks index
                     blocks[index] = (short) (b[index] & 0xFF);
-                }
-                else {
+                } else {
                     if ((index & 1) == 0) {
                         blocks[index] = (short) (((addId[index >> 1] & 0x0F) << 8) + (b[index] & 0xFF));
-                    }
-                    else {
+                    } else {
                         blocks[index] = (short) (((addId[index >> 1] & 0xF0) << 4) + (b[index] & 0xFF));
                     }
                 }
@@ -233,8 +213,7 @@ public class SchematicHandler {
             // }
             // }
             schematic = new Schematic(collection, dimension, file);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
             return null;
         }
@@ -244,10 +223,9 @@ public class SchematicHandler {
     /**
      * Saves a schematic to a file path
      *
-     * @param tag
-     *            to save
-     * @param path
-     *            to save in
+     * @param tag  to save
+     * @param path to save in
+     *
      * @return true if succeeded
      */
     public static boolean save(final CompoundTag tag, final String path) {
@@ -263,8 +241,7 @@ public class SchematicHandler {
             output.writeTag(tag);
             output.close();
             stream.close();
-        }
-        catch (final IOException e) {
+        } catch (final IOException e) {
             e.printStackTrace();
             return false;
         }
@@ -274,10 +251,9 @@ public class SchematicHandler {
     /**
      * Gets the schematic of a plot
      *
-     * @param world
-     *            to check
-     * @param id
-     *            plot
+     * @param world to check
+     * @param id    plot
+     *
      * @return tag
      */
     @SuppressWarnings("deprecation")
@@ -306,8 +282,7 @@ public class SchematicHandler {
                     }
                 }
             }
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             PlotMain.sendConsoleSenderMessage("&7 - Cannot save: corrupt chunk at " + (i / 16) + ", " + (j / 16));
             return null;
         }
@@ -337,8 +312,7 @@ public class SchematicHandler {
 
                     final Block block = world.getBlockAt(new Location(world, pos1.getBlockX() + x, y, pos1.getBlockZ() + z));
 
-                    @SuppressWarnings("deprecation")
-                    final int id2 = block.getTypeId();
+                    @SuppressWarnings("deprecation") final int id2 = block.getTypeId();
 
                     if (id2 > 255) {
                         if (addBlocks == null) {
@@ -408,8 +382,8 @@ public class SchematicHandler {
      */
     public static class Schematic {
         private final DataCollection[] blockCollection;
-        private final Dimension        schematicDimension;
-        private final File             file;
+        private final Dimension schematicDimension;
+        private final File file;
 
         public Schematic(final DataCollection[] blockCollection, final Dimension schematicDimension, final File file) {
             this.blockCollection = blockCollection;
@@ -466,7 +440,7 @@ public class SchematicHandler {
      */
     public static class DataCollection {
         private final short block;
-        private final byte  data;
+        private final byte data;
 
         // public CompoundTag tag;
 
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SendChunk.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SendChunk.java
index 9fc7ed03c..19fe9ed33 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SendChunk.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SendChunk.java
@@ -1,42 +1,40 @@
 package com.intellectualcrafters.plot.util;
 
-import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-
 import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
 import com.intellectualcrafters.plot.util.ReflectionUtils.RefConstructor;
 import com.intellectualcrafters.plot.util.ReflectionUtils.RefField;
 import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
 
 /**
- * An utility that can be used to send chunks, rather than
- * using bukkit code to do so (uses heavy NMS)
+ * An utility that can be used to send chunks, rather than using bukkit code to do so (uses heavy NMS)
  *
  * @author Empire92
  */
 public class SendChunk {
 
     // Ref Class
-    private static final RefClass classWorld             = getRefClass("{nms}.World");
-    private static final RefClass classEntityPlayer      = getRefClass("{nms}.EntityPlayer");
+    private static final RefClass classWorld = getRefClass("{nms}.World");
+    private static final RefClass classEntityPlayer = getRefClass("{nms}.EntityPlayer");
     private static final RefClass classChunkCoordIntPair = getRefClass("{nms}.ChunkCoordIntPair");
-    private static final RefClass classCraftChunk        = getRefClass("{cb}.CraftChunk");
-    private static final RefClass classChunk             = getRefClass("{nms}.Chunk");
+    private static final RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
+    private static final RefClass classChunk = getRefClass("{nms}.Chunk");
 
     // Ref Method
-    private static RefMethod      methodGetHandle;
+    private static RefMethod methodGetHandle;
 
     // Ref Field
-    private static RefField       chunkCoordIntPairQueue;
-    private static RefField       players;
-    private static RefField       locX;
-    private static RefField       locZ;
-    private static RefField       world;
+    private static RefField chunkCoordIntPairQueue;
+    private static RefField players;
+    private static RefField locX;
+    private static RefField locZ;
+    private static RefField world;
 
     // Ref Constructor
     private static RefConstructor ChunkCoordIntPairCon;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SetBlockFast.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SetBlockFast.java
index 5b29b5c09..5545168a9 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SetBlockFast.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/SetBlockFast.java
@@ -21,33 +21,31 @@
 
 package com.intellectualcrafters.plot.util;
 
-import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
-
-import java.util.ArrayList;
-
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
+import java.util.ArrayList;
+
+import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
 
 /**
- * SetBlockFast class

- * Used to do fast world editing
+ * SetBlockFast class
 Used to do fast world editing
  *
  * @author Empire92
  */
 public class SetBlockFast {
 
-    private static final RefClass classBlock      = getRefClass("{nms}.Block");
-    private static final RefClass classChunk      = getRefClass("{nms}.Chunk");
-    private static final RefClass classWorld      = getRefClass("{nms}.World");
+    private static final RefClass classBlock = getRefClass("{nms}.Block");
+    private static final RefClass classChunk = getRefClass("{nms}.Chunk");
+    private static final RefClass classWorld = getRefClass("{nms}.World");
     private static final RefClass classCraftWorld = getRefClass("{cb}.CraftWorld");
 
-    private static RefMethod      methodGetHandle;
-    private static RefMethod      methodGetChunkAt;
-    private static RefMethod      methodA;
-    private static RefMethod      methodGetById;
+    private static RefMethod methodGetHandle;
+    private static RefMethod methodGetChunkAt;
+    private static RefMethod methodA;
+    private static RefMethod methodGetById;
 
     /**
      * Constructor
@@ -64,19 +62,15 @@ public class SetBlockFast {
     /**
      * Set the block at the location
      *
-     * @param world
-     *            World in which the block should be set
-     * @param x
-     *            X Coordinate
-     * @param y
-     *            Y Coordinate
-     * @param z
-     *            Z Coordinate
-     * @param blockId
-     *            Block ID
-     * @param data
-     *            Block Data Value
+     * @param world   World in which the block should be set
+     * @param x       X Coordinate
+     * @param y       Y Coordinate
+     * @param z       Z Coordinate
+     * @param blockId Block ID
+     * @param data    Block Data Value
+     *
      * @return true
+     *
      * @throws NoSuchMethodException
      */
     public static boolean set(final org.bukkit.World world, final int x, final int y, final int z, final int blockId, final byte data) throws NoSuchMethodException {
@@ -91,8 +85,7 @@ public class SetBlockFast {
     /**
      * Update chunks
      *
-     * @param player
-     *            Player whose chunks we're updating
+     * @param player Player whose chunks we're updating
      */
     public static void update(final org.bukkit.entity.Player player) {
         if (!PlotHelper.canSendChunk) {
@@ -118,8 +111,7 @@ public class SetBlockFast {
 
         try {
             SendChunk.sendChunk(chunks);
-        }
-        catch (final Throwable e) {
+        } catch (final Throwable e) {
             PlotHelper.canSendChunk = false;
         }
     }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java
index fcbdf4c27..abd77cec1 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java
@@ -29,8 +29,7 @@ import java.util.Collections;
  *
  * @author Citymonstret
  */
-@SuppressWarnings("unused")
-public class StringComparison {
+@SuppressWarnings("unused") public class StringComparison {
 
     /**
      * Best Match
@@ -52,10 +51,8 @@ public class StringComparison {
     /**
      * Constructor
      *
-     * @param input
-     *            Input Base Value
-     * @param objects
-     *            Objects to compare
+     * @param input   Input Base Value
+     * @param objects Objects to compare
      */
     public StringComparison(final String input, final Object[] objects) {
         double c;
@@ -73,10 +70,9 @@ public class StringComparison {
     /**
      * Compare two strings
      *
-     * @param s1
-     *            String Base
-     * @param s2
-     *            Object
+     * @param s1 String Base
+     * @param s2 Object
+     *
      * @return match
      */
     public static double compare(final String s1, final String s2) {
@@ -98,8 +94,8 @@ public class StringComparison {
     /**
      * Create an ArrayList containing pairs of letters
      *
-     * @param s
-     *            string to split
+     * @param s string to split
+     *
      * @return ArrayList
      */
     public static ArrayList wLetterPair(final String s) {
@@ -115,8 +111,8 @@ public class StringComparison {
     /**
      * Get an array containing letter pairs
      *
-     * @param s
-     *            string to split
+     * @param s string to split
+     *
      * @return Array
      */
     public static String[] sLetterPair(final String s) {
@@ -152,7 +148,7 @@ public class StringComparison {
      * @return object[] containing: double, String
      */
     public Object[] getBestMatchAdvanced() {
-        return new Object[] { this.match, this.bestMatch };
+        return new Object[]{this.match, this.bestMatch};
     }
 
 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
index cc0822a29..d450ff557 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
@@ -21,70 +21,57 @@
 
 package com.intellectualcrafters.plot.util;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-
 import com.google.common.base.Charsets;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.object.StringWrapper;
-import com.intellectualcrafters.plot.uuid.DefaultUUIDWrapper;
-import com.intellectualcrafters.plot.uuid.NameFetcher;
-import com.intellectualcrafters.plot.uuid.OfflineUUIDWrapper;
-import com.intellectualcrafters.plot.uuid.UUIDFetcher;
-import com.intellectualcrafters.plot.uuid.UUIDSaver;
-import com.intellectualcrafters.plot.uuid.UUIDWrapper;
+import com.intellectualcrafters.plot.uuid.*;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.UUID;
 
 /**
- * This class can be used to efficiently translate UUIDs and names back and
- * forth.
- * It uses three primary methods of achieving this:
- * - Read From Cache
- * - Read from OfflinePlayer objects
- * - Read from (if onlinemode: mojang api) (else: playername hashing)
- * All UUIDs/Usernames will be stored in a map (cache) until the server is
- * restarted.
+ * This class can be used to efficiently translate UUIDs and names back and forth. It uses three primary methods of
+ * achieving this: - Read From Cache - Read from OfflinePlayer objects - Read from (if onlinemode: mojang api) (else:
+ * playername hashing) All UUIDs/Usernames will be stored in a map (cache) until the server is restarted.
  * 

- * You can use getUuidMap() to save the uuids/names to a file (SQLite db for
- * example). Primary methods: getUUID(String name) & getName(UUID uuid) <-- You
- * should ONLY use these. Call startFetch(JavaPlugin plugin) in your onEnable().
+ * You can use getUuidMap() to save the uuids/names to a file (SQLite db for example). Primary methods: getUUID(String
+ * name) & getName(UUID uuid) <-- You should ONLY use these. Call startFetch(JavaPlugin plugin) in your onEnable().
  * 

  * Originally created by:
  *
  * @author Citymonstret
- * @author Empire92
- *         for PlotSquared.
+ * @author Empire92 for PlotSquared.
  */
-@SuppressWarnings("unused")
-public class UUIDHandler {
+@SuppressWarnings("unused") public class UUIDHandler {
 
-    public static UUIDWrapper                       uuidWrapper = null;
+    public static UUIDWrapper uuidWrapper = null;
 
     /**
      * Online mode
      *
      * @see org.bukkit.Server#getOnlineMode()
      */
-    private final static boolean                    online      = Bukkit.getServer().getOnlineMode() && !Settings.OFFLINE_MODE;
+    private final static boolean online = Bukkit.getServer().getOnlineMode() && !Settings.OFFLINE_MODE;
 
     /**
      * Map containing names and UUIDs
      *
      * @see com.google.common.collect.BiMap
      */
-    private final static BiMap uuidMap     = HashBiMap.create(new HashMap());
+    private final static BiMap uuidMap = HashBiMap.create(new HashMap());
 
     /**
      * Get the map containing all names/uuids
      *
      * @return map with names + uuids
+     *
      * @see com.google.common.collect.BiMap
      */
     public static BiMap getUuidMap() {
@@ -94,9 +81,10 @@ public class UUIDHandler {
     /**
      * Check if a uuid is cached
      *
-     * @param uuid
-     *            to check
+     * @param uuid to check
+     *
      * @return true of the uuid is cached
+     *
      * @see com.google.common.collect.BiMap#containsValue(Object)
      */
     public static boolean uuidExists(final UUID uuid) {
@@ -106,9 +94,10 @@ public class UUIDHandler {
     /**
      * Check if a name is cached
      *
-     * @param name
-     *            to check
+     * @param name to check
+     *
      * @return true of the name is cached
+     *
      * @see com.google.common.collect.BiMap#containsKey(Object)
      */
     public static boolean nameExists(final StringWrapper name) {
@@ -118,10 +107,8 @@ public class UUIDHandler {
     /**
      * Add a set to the cache
      *
-     * @param name
-     *            to cache
-     * @param uuid
-     *            to cache
+     * @param name to cache
+     * @param uuid to cache
      */
     public static void add(final StringWrapper name, final UUID uuid) {
         if (!uuidMap.containsKey(name) && !uuidMap.inverse().containsKey(uuid)) {
@@ -130,8 +117,8 @@ public class UUIDHandler {
     }
 
     /**
-     * @param name
-     *            to use as key
+     * @param name to use as key
+     *
      * @return uuid
      */
     public static UUID getUUID(final String name) {
@@ -139,8 +126,7 @@ public class UUIDHandler {
         if (uuidMap.containsKey(nameWrap)) {
             return uuidMap.get(nameWrap);
         }
-        @SuppressWarnings("deprecation")
-        final Player player = Bukkit.getPlayer(name);
+        @SuppressWarnings("deprecation") final Player player = Bukkit.getPlayer(name);
         if (player != null) {
             final UUID uuid = getUUID(player);
             add(nameWrap, uuid);
@@ -154,38 +140,33 @@ public class UUIDHandler {
                 }
                 try {
                     return PlotMain.getUUIDSaver().mojangUUID(name);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     try {
                         final UUIDFetcher fetcher = new UUIDFetcher(Arrays.asList(name));
                         uuid = fetcher.call().get(name);
                         add(nameWrap, uuid);
-                    }
-                    catch (final Exception ex) {
+                    } catch (final Exception ex) {
                         ex.printStackTrace();
                     }
                 }
-            }
-            else {
+            } else {
                 try {
                     final UUIDFetcher fetcher = new UUIDFetcher(Arrays.asList(name));
                     uuid = fetcher.call().get(name);
                     add(nameWrap, uuid);
-                }
-                catch (final Exception ex) {
+                } catch (final Exception ex) {
                     ex.printStackTrace();
                 }
             }
-        }
-        else {
+        } else {
             return getUuidOfflineMode(nameWrap);
         }
         return null;
     }
 
     /**
-     * @param uuid
-     *            to use as key
+     * @param uuid to use as key
+     *
      * @return name (cache)
      */
     private static StringWrapper loopSearch(final UUID uuid) {
@@ -193,8 +174,8 @@ public class UUIDHandler {
     }
 
     /**
-     * @param uuid
-     *            to use as key
+     * @param uuid to use as key
+     *
      * @return Name
      */
     public static String getName(final UUID uuid) {
@@ -215,51 +196,44 @@ public class UUIDHandler {
                     name = fetcher.call().get(uuid);
                     add(new StringWrapper(name), uuid);
                     return name;
-                }
-                catch (final Exception ex) {
+                } catch (final Exception ex) {
                     ex.printStackTrace();
                 }
-            }
-            else {
+            } else {
                 try {
                     return PlotMain.getUUIDSaver().mojangName(uuid);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     try {
                         final NameFetcher fetcher = new NameFetcher(Arrays.asList(uuid));
                         name = fetcher.call().get(uuid);
                         add(new StringWrapper(name), uuid);
                         return name;
-                    }
-                    catch (final Exception ex) {
+                    } catch (final Exception ex) {
                         e.printStackTrace();
                     }
                 }
             }
             try {
                 return PlotMain.getUUIDSaver().mojangName(uuid);
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 try {
                     final NameFetcher fetcher = new NameFetcher(Arrays.asList(uuid));
                     name = fetcher.call().get(uuid);
                     add(new StringWrapper(name), uuid);
                     return name;
-                }
-                catch (final Exception ex) {
+                } catch (final Exception ex) {
                     ex.printStackTrace();
                 }
             }
-        }
-        else {
+        } else {
             return "unknown";
         }
         return "";
     }
 
     /**
-     * @param name
-     *            to use as key
+     * @param name to use as key
+     *
      * @return UUID (name hash)
      */
     private static UUID getUuidOfflineMode(final StringWrapper name) {
@@ -269,8 +243,8 @@ public class UUIDHandler {
     }
 
     /**
-     * @param uuid
-     *            to use as key
+     * @param uuid to use as key
+     *
      * @return String - name
      */
     private static String getNameOnlinePlayer(final UUID uuid) {
@@ -284,8 +258,8 @@ public class UUIDHandler {
     }
 
     /**
-     * @param uuid
-     *            to use as key
+     * @param uuid to use as key
+     *
      * @return String - name
      */
     private static String getNameOfflinePlayer(final UUID uuid) {
@@ -299,13 +273,12 @@ public class UUIDHandler {
     }
 
     /**
-     * @param name
-     *            to use as key
+     * @param name to use as key
+     *
      * @return UUID
      */
     private static UUID getUuidOnlinePlayer(final StringWrapper name) {
-        @SuppressWarnings("deprecation")
-        final Player player = Bukkit.getPlayer(name.value);
+        @SuppressWarnings("deprecation") final Player player = Bukkit.getPlayer(name.value);
         if (player == null) {
             return null;
         }
@@ -330,8 +303,7 @@ public class UUIDHandler {
             try {
                 getUUID(player);
                 uuidWrapper = new DefaultUUIDWrapper();
-            }
-            catch (final Throwable e) {
+            } catch (final Throwable e) {
                 uuidWrapper = new OfflineUUIDWrapper();
             }
         }
@@ -339,29 +311,25 @@ public class UUIDHandler {
     }
 
     /**
-     * Safely provide the correct UUID provider. Ignores user preference if not
-     * possible rather than break the plugin.
+     * Safely provide the correct UUID provider. Ignores user preference if not possible rather than break the plugin.
      */
     public static UUID getUUID(final OfflinePlayer player) {
         if (uuidWrapper == null) {
 
             if (Settings.OFFLINE_MODE) {
                 uuidWrapper = new OfflineUUIDWrapper();
-            }
-            else {
+            } else {
                 try {
                     getUUID(player);
                     uuidWrapper = new DefaultUUIDWrapper();
-                }
-                catch (final Throwable e) {
+                } catch (final Throwable e) {
                     uuidWrapper = new OfflineUUIDWrapper();
                 }
             }
         }
         try {
             return uuidWrapper.getUUID(player);
-        }
-        catch (final Throwable e) {
+        } catch (final Throwable e) {
             uuidWrapper = new OfflineUUIDWrapper();
             return uuidWrapper.getUUID(player);
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java
index 85d7be275..f3937e7ca 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/DefaultUUIDWrapper.java
@@ -1,11 +1,11 @@
 package com.intellectualcrafters.plot.uuid;
 
-import java.util.UUID;
-
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
+import java.util.UUID;
+
 public class DefaultUUIDWrapper extends UUIDWrapper {
 
     @Override
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/NameFetcher.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/NameFetcher.java
index bc88cbb7c..f9f9e469e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/NameFetcher.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/NameFetcher.java
@@ -21,6 +21,10 @@
 
 package com.intellectualcrafters.plot.uuid;
 
+import com.google.common.collect.ImmutableList;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -30,19 +34,13 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-
-import com.google.common.collect.ImmutableList;
-
 /**
- * Name Fetcher Class
- * From Bukkit
+ * Name Fetcher Class From Bukkit
  */
 public class NameFetcher implements Callable> {
     private static final String PROFILE_URL = "https://sessionserver.mojang.com/session/minecraft/profile/";
-    private final JSONParser    jsonParser  = new JSONParser();
-    private final List    uuids;
+    private final JSONParser jsonParser = new JSONParser();
+    private final List uuids;
 
     public NameFetcher(final List uuids) {
         this.uuids = ImmutableList.copyOf(uuids);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java
index 55286ce26..1c7013ee8 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/OfflineUUIDWrapper.java
@@ -1,15 +1,14 @@
 package com.intellectualcrafters.plot.uuid;
 
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-
 import com.google.common.base.Charsets;
 import com.google.common.collect.BiMap;
 import com.intellectualcrafters.plot.object.StringWrapper;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+import java.util.UUID;
 
 public class OfflineUUIDWrapper extends UUIDWrapper {
 
@@ -29,8 +28,7 @@ public class OfflineUUIDWrapper extends UUIDWrapper {
         final String name = map.get(uuid).value;
         if (name != null) {
             return Bukkit.getOfflinePlayer(name);
-        }
-        else {
+        } else {
             for (final OfflinePlayer player : Bukkit.getOfflinePlayers()) {
                 if (getUUID(player).equals(uuid)) {
                     return player;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/PlotUUIDSaver.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/PlotUUIDSaver.java
index da6165de6..fcf112285 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/PlotUUIDSaver.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/PlotUUIDSaver.java
@@ -21,13 +21,6 @@
 
 package com.intellectualcrafters.plot.uuid;
 
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-
 import com.google.common.collect.BiMap;
 import com.intellectualcrafters.json.JSONObject;
 import com.intellectualcrafters.json.JSONTokener;
@@ -35,6 +28,12 @@ import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.object.StringWrapper;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.UUID;
 
 /**
  * Plot UUID Saver/Fetcher
@@ -70,8 +69,7 @@ public class PlotUUIDSaver implements UUIDSaver {
                 double ups;
                 if ((time == 0l) || (size == 0)) {
                     ups = size;
-                }
-                else {
+                } else {
                     ups = size / time;
                 }
 
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java
index e3351725b..4fcd23b6e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDFetcher.java
@@ -21,34 +21,28 @@
 
 package com.intellectualcrafters.plot.uuid;
 
+import com.google.common.collect.ImmutableList;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.Callable;
 
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-
-import com.google.common.collect.ImmutableList;
-
 /**
- * UUID Fetcher
- * From Bukkit
+ * UUID Fetcher From Bukkit
  */
 public class UUIDFetcher implements Callable> {
     private static final double PROFILES_PER_REQUEST = 100;
-    private static final String PROFILE_URL          = "https://api.mojang.com/profiles/minecraft";
-    private final JSONParser    jsonParser           = new JSONParser();
-    private final List  names;
-    private final boolean       rateLimiting;
+    private static final String PROFILE_URL = "https://api.mojang.com/profiles/minecraft";
+    private final JSONParser jsonParser = new JSONParser();
+    private final List names;
+    private final boolean rateLimiting;
 
     public UUIDFetcher(final List names, final boolean rateLimiting) {
         this.names = ImmutableList.copyOf(names);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSaver.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSaver.java
index 673682d24..d65bebe75 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSaver.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSaver.java
@@ -21,11 +21,11 @@
 
 package com.intellectualcrafters.plot.uuid;
 
-import java.util.UUID;
-
 import com.google.common.collect.BiMap;
 import com.intellectualcrafters.plot.object.StringWrapper;
 
+import java.util.UUID;
+
 /**
  * @author Citymonstret
  */
@@ -39,24 +39,22 @@ public interface UUIDSaver {
     /**
      * Save the UUIDs
      *
-     * @param biMap
-     *            Map containing names and UUIDs
+     * @param biMap Map containing names and UUIDs
      */
     public void globalSave(final BiMap biMap);
 
     /**
      * Save a single UUIDSet
      *
-     * @param set
-     *            Set to save
+     * @param set Set to save
      */
     public void save(final UUIDSet set);
 
     /**
      * Get a single UUIDSet
      *
-     * @param name
-     *            Username
+     * @param name Username
+     *
      * @return UUID Set
      */
     public UUIDSet get(final String name);
@@ -64,8 +62,8 @@ public interface UUIDSaver {
     /**
      * Get a single UUIDSet
      *
-     * @param uuid
-     *            UUID
+     * @param uuid UUID
+     *
      * @return UUID Set
      */
     public UUIDSet get(final UUID uuid);
@@ -73,9 +71,10 @@ public interface UUIDSaver {
     /**
      * Fetch uuid from mojang servers
      *
-     * @param name
-     *            Username
+     * @param name Username
+     *
      * @return uuid
+     *
      * @throws Exception
      */
     public UUID mojangUUID(final String name) throws Exception;
@@ -83,9 +82,10 @@ public interface UUIDSaver {
     /**
      * Fetch username from mojang servers
      *
-     * @param uuid
-     *            UUID
+     * @param uuid UUID
+     *
      * @return username
+     *
      * @throws Exception
      */
     public String mojangName(final UUID uuid) throws Exception;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSet.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSet.java
index 71251c23f..8b8071bec 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSet.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDSet.java
@@ -36,15 +36,13 @@ public class UUIDSet {
     /**
      * Player UUID
      */
-    private final UUID   uuid;
+    private final UUID uuid;
 
     /**
      * Constructor
      *
-     * @param name
-     *            Username
-     * @param uuid
-     *            UUID
+     * @param name Username
+     * @param uuid UUID
      */
     public UUIDSet(final String name, final UUID uuid) {
         this.name = name;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java
index 8e37da72f..ede99dfaa 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java
@@ -1,10 +1,10 @@
 package com.intellectualcrafters.plot.uuid;
 
-import java.util.UUID;
-
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
+import java.util.UUID;
+
 public abstract class UUIDWrapper {
     public abstract UUID getUUID(Player player);
 
diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/Translation.java b/PlotSquared/src/main/java/com/intellectualsites/translation/Translation.java
index 6476cd624..7ef58979a 100644
--- a/PlotSquared/src/main/java/com/intellectualsites/translation/Translation.java
+++ b/PlotSquared/src/main/java/com/intellectualsites/translation/Translation.java
@@ -10,9 +10,7 @@ import java.lang.annotation.Target;
  *
  * @author Citymonstret
  */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface Translation {
+@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Translation {
     String description() default "";
 
     String creationDescription() default "";
diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationAsset.java b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationAsset.java
index 1d5aa3b4f..e584f01e6 100644
--- a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationAsset.java
+++ b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationAsset.java
@@ -7,8 +7,8 @@ package com.intellectualsites.translation;
  */
 public class TranslationAsset {
 
-    private final TranslationObject   trans;
-    private final String              translated;
+    private final TranslationObject trans;
+    private final String translated;
     private final TranslationLanguage lang;
 
     public TranslationAsset(final TranslationObject trans, final String translated, final TranslationLanguage lang) {
diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationFile.java b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationFile.java
index fca767221..eb7aa89d0 100644
--- a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationFile.java
+++ b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationFile.java
@@ -29,10 +29,8 @@ public abstract class TranslationFile {
     /**
      * Add a value
      *
-     * @param key
-     *            name
-     * @param value
-     *            value
+     * @param key   name
+     * @param value value
      */
     public abstract void add(String key, String value);
 
diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationLanguage.java b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationLanguage.java
index 4b3cc711a..02b9e2b7c 100644
--- a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationLanguage.java
+++ b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationLanguage.java
@@ -3,12 +3,12 @@ package com.intellectualsites.translation;
 public class TranslationLanguage {
 
     public static final TranslationLanguage englishAmerican = (new TranslationLanguage("American English", "us", "en"));
-    public static final TranslationLanguage englishBritish  = (new TranslationLanguage("British English", "gb", "en"));
-    public static final TranslationLanguage swedishSwedish  = (new TranslationLanguage("Swedish", "sv", "se"));
-    public static final TranslationLanguage russianRussian  = (new TranslationLanguage("Russian", "ru", "ru"));
-    private final String                    countryCode;
-    private final String                    languageCode;
-    private final String                    friendlyName;
+    public static final TranslationLanguage englishBritish = (new TranslationLanguage("British English", "gb", "en"));
+    public static final TranslationLanguage swedishSwedish = (new TranslationLanguage("Swedish", "sv", "se"));
+    public static final TranslationLanguage russianRussian = (new TranslationLanguage("Russian", "ru", "ru"));
+    private final String countryCode;
+    private final String languageCode;
+    private final String friendlyName;
 
     public TranslationLanguage(final String friendlyName, final String countryCode, final String languageCode) {
         this.friendlyName = friendlyName;
@@ -17,7 +17,7 @@ public class TranslationLanguage {
     }
 
     public static TranslationLanguage[] values() {
-        return new TranslationLanguage[] { englishAmerican, englishBritish, swedishSwedish };
+        return new TranslationLanguage[]{englishAmerican, englishBritish, swedishSwedish};
     }
 
     public String getName() {
diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationManager.java b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationManager.java
index a107c8d58..228591970 100644
--- a/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationManager.java
+++ b/PlotSquared/src/main/java/com/intellectualsites/translation/TranslationManager.java
@@ -3,11 +3,7 @@ package com.intellectualsites.translation;
 import java.io.PrintStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 
 /**
  * Translation Manager Main class
@@ -19,7 +15,7 @@ public class TranslationManager {
     /**
      * Objects
      */
-    private final LinkedList           translationObjects;
+    private final LinkedList translationObjects;
     /**
      * The translations
      */
@@ -29,14 +25,13 @@ public class TranslationManager {
      * Constructor
      */
     public TranslationManager() {
-        this(new TranslationObject[] {});
+        this(new TranslationObject[]{});
     }
 
     /**
      * Constructor
      *
-     * @param translationObjects
-     *            pre-init
+     * @param translationObjects pre-init
      */
     public TranslationManager(final TranslationObject[] translationObjects) {
         this.translationObjects = new LinkedList(Arrays.asList(translationObjects));
@@ -88,8 +83,8 @@ public class TranslationManager {
     /**
      * Add an object
      *
-     * @param t
-     *            object
+     * @param t object
+     *
      * @return instance
      */
     public TranslationManager addTranslationObject(final TranslationObject t) {
@@ -100,8 +95,8 @@ public class TranslationManager {
     /**
      * Remove an object
      *
-     * @param t
-     *            object
+     * @param t object
+     *
      * @return instance
      */
     public TranslationManager removeTranslationObject(final TranslationObject t) {
diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/YamlTranslationFile.java b/PlotSquared/src/main/java/com/intellectualsites/translation/YamlTranslationFile.java
index 5d52f43ec..9176497dd 100644
--- a/PlotSquared/src/main/java/com/intellectualsites/translation/YamlTranslationFile.java
+++ b/PlotSquared/src/main/java/com/intellectualsites/translation/YamlTranslationFile.java
@@ -1,5 +1,8 @@
 package com.intellectualsites.translation;
 
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -8,39 +11,32 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-
 /**
- * The YAML implementation of TranslationFile
- * Relies heavily on SnakeYAML
+ * The YAML implementation of TranslationFile Relies heavily on SnakeYAML
  *
  * @author Citymonstret
  */
 public class YamlTranslationFile extends TranslationFile {
 
     final private TranslationLanguage language;
-    final private String              name;
-    final private TranslationManager  manager;
-    private final File                file;
-    private HashMap   map;
-    private String[]                  header;
-    private boolean                   fancyHead = false;
-    private YamlTranslationFile       instance;
+    final private String name;
+    final private TranslationManager manager;
+    private final File file;
+    private HashMap map;
+    private String[] header;
+    private boolean fancyHead = false;
+    private YamlTranslationFile instance;
     /**
      * YAML Object
      */
-    private Yaml                      yaml;
+    private Yaml yaml;
 
     /**
      * Constructor
      *
-     * @param path
-     *            save path
-     * @param language
-     *            translation language
-     * @param name
-     *            project name
+     * @param path     save path
+     * @param language translation language
+     * @param name     project name
      */
     public YamlTranslationFile(final File path, final TranslationLanguage language, final String name, final TranslationManager manager) {
         this.language = language;
@@ -57,8 +53,7 @@ public class YamlTranslationFile extends TranslationFile {
                 if (!this.file.createNewFile()) {
                     throw new RuntimeException("Could not create: " + this.file.getName());
                 }
-            }
-            catch (final Exception e) {
+            } catch (final Exception e) {
                 e.printStackTrace();
             }
         }
@@ -77,8 +72,8 @@ public class YamlTranslationFile extends TranslationFile {
     /**
      * Set the header
      *
-     * @param header
-     *            Comment header
+     * @param header Comment header
+     *
      * @return instance
      */
     public YamlTranslationFile header(final String... header) {
@@ -90,8 +85,8 @@ public class YamlTranslationFile extends TranslationFile {
     /**
      * Set a fancy header
      *
-     * @param header
-     *            Comment header
+     * @param header Comment header
+     *
      * @return instance
      */
     public YamlTranslationFile fancyHeader(final String... header) {
@@ -116,10 +111,8 @@ public class YamlTranslationFile extends TranslationFile {
     /**
      * Add a translation
      *
-     * @param key
-     *            translation name
-     * @param value
-     *            translation value
+     * @param key   translation name
+     * @param value translation value
      */
     @Override
     public void add(final String key, final String value) {
@@ -151,8 +144,7 @@ public class YamlTranslationFile extends TranslationFile {
                 for (final String head : this.header) {
                     writer.write("# " + head + "\n");
                 }
-            }
-            else if ((this.header != null) && this.fancyHead) {
+            } else if ((this.header != null) && this.fancyHead) {
                 for (final String head : this.header) {
                     writer.write(head);
                 }
@@ -165,15 +157,13 @@ public class YamlTranslationFile extends TranslationFile {
                 final String des = this.manager.getDescription(var);
                 if (des.equals("")) {
                     writer.write(var + ": \"" + val + "\"" + (current < (length - 1) ? "\n" : ""));
-                }
-                else {
+                } else {
                     writer.write(des + "\n" + var + ": \"" + val + "\"" + (current < (length - 1) ? "\n" : ""));
                 }
                 ++current;
             }
             writer.close();
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
         }
     }
@@ -205,8 +195,7 @@ public class YamlTranslationFile extends TranslationFile {
     public YamlTranslationFile read() {
         try {
             this.map = (HashMap) getYaml().load(new FileReader(this.file));
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
         }
         if (this.map == null) {
diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/BukkitTranslation.java b/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/BukkitTranslation.java
index 9deae1248..9f3c76378 100644
--- a/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/BukkitTranslation.java
+++ b/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/BukkitTranslation.java
@@ -1,14 +1,13 @@
 package com.intellectualsites.translation.bukkit;
 
-import java.io.File;
-
-import org.bukkit.Material;
-import org.bukkit.plugin.java.JavaPlugin;
-
 import com.intellectualsites.translation.TranslationAsset;
 import com.intellectualsites.translation.TranslationLanguage;
 import com.intellectualsites.translation.TranslationManager;
 import com.intellectualsites.translation.TranslationObject;
+import org.bukkit.Material;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.File;
 
 /**
  * @author Citymonstret
@@ -18,8 +17,8 @@ public class BukkitTranslation {
     /**
      * Get the converted string
      *
-     * @param asset
-     *            asset
+     * @param asset asset
+     *
      * @return converted asset
      */
     public static String convert(final TranslationAsset asset) {
@@ -32,8 +31,8 @@ public class BukkitTranslation {
     /**
      * Get the universal parent based on the plugin data folder
      *
-     * @param plugin
-     *            to check
+     * @param plugin to check
+     *
      * @return parent folder
      */
     public static File getParent(final JavaPlugin plugin) {
@@ -50,8 +49,7 @@ public class BukkitTranslation {
     }
 
     /**
-     * Add material names to the translation list
-     * Will default to a somewhat friendly name
+     * Add material names to the translation list Will default to a somewhat friendly name
      */
     public static void addMaterials(final TranslationManager manager) {
         for (final Material material : Material.values()) {
diff --git a/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/TranslationPlugin.java b/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/TranslationPlugin.java
index db2582deb..66354b4aa 100644
--- a/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/TranslationPlugin.java
+++ b/PlotSquared/src/main/java/com/intellectualsites/translation/bukkit/TranslationPlugin.java
@@ -1,26 +1,21 @@
 package com.intellectualsites.translation.bukkit;
 
-import java.util.logging.Level;
-
+import com.intellectualsites.translation.*;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.intellectualsites.translation.Translation;
-import com.intellectualsites.translation.TranslationFile;
-import com.intellectualsites.translation.TranslationLanguage;
-import com.intellectualsites.translation.TranslationManager;
-import com.intellectualsites.translation.YamlTranslationFile;
+import java.util.logging.Level;
 
 public class TranslationPlugin extends JavaPlugin {
 
     @Translation(description = "Printed when the translator is fully loaded")
-    private static final String       TRANSLATOR_LOADED   = "The translator has been loaded";
+    private static final String TRANSLATOR_LOADED = "The translator has been loaded";
 
     @Translation(description = "Printed when the translator has been disabled")
-    private static final String       TRANSLATOR_DISABLED = "The translator has been disabled";
+    private static final String TRANSLATOR_DISABLED = "The translator has been disabled";
 
     private static TranslationManager manager;
 
-    private TranslationFile           english;
+    private TranslationFile english;
 
     @Override
     public void onEnable() {
@@ -29,8 +24,7 @@ public class TranslationPlugin extends JavaPlugin {
         // Scan this file for all @Translations
         try {
             TranslationManager.scan(TranslationPlugin.class, manager);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
         }
         // Now let's create some default files :D
diff --git a/PlotSquared/src/test/java/Test1.java b/PlotSquared/src/test/java/Test1.java
index c2f8790f4..373d96de7 100644
--- a/PlotSquared/src/test/java/Test1.java
+++ b/PlotSquared/src/test/java/Test1.java
@@ -1,13 +1,3 @@
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.UUID;
-
-import org.bukkit.OfflinePlayer;
-import org.bukkit.block.Biome;
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.database.AbstractDB;
@@ -15,14 +5,18 @@ import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.generator.DefaultPlotManager;
 import com.intellectualcrafters.plot.generator.DefaultPlotWorld;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotComment;
-import com.intellectualcrafters.plot.object.PlotHomePosition;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.object.*;
 import com.intellectualcrafters.plot.util.PlotHelper;
 import com.intellectualcrafters.plot.util.SetBlockFast;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.block.Biome;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.UUID;
 
 public class Test1 {
 
@@ -109,8 +103,7 @@ public class Test1 {
         try {
             final PlotMain plugin = PlotMain.getMain();
             passed = plugin != null;
-        }
-        catch (final Throwable e) {
+        } catch (final Throwable e) {
 
         }
         return passed;
@@ -121,8 +114,7 @@ public class Test1 {
         try {
             final Object id = new PlotId(0, 0);
             passed = id != null;
-        }
-        catch (final Throwable e) {
+        } catch (final Throwable e) {
 
         }
         return passed;
@@ -131,10 +123,9 @@ public class Test1 {
     public boolean test4_InitPlot() {
         boolean passed = false;
         try {
-            new Plot(new PlotId(0, 0), DBFunc.everyone, Biome.FOREST, new ArrayList(), new ArrayList(), new ArrayList(), null, PlotHomePosition.DEFAULT, null, "testworld", new boolean[] { false, false, false, false });
+            new Plot(new PlotId(0, 0), DBFunc.everyone, Biome.FOREST, new ArrayList(), new ArrayList(), new ArrayList(), null, PlotHomePosition.DEFAULT, null, "testworld", new boolean[]{false, false, false, false});
             passed = true;
-        }
-        catch (final Throwable ignored) {
+        } catch (final Throwable ignored) {
 
         }
         return passed;
@@ -228,7 +219,7 @@ public class Test1 {
 
                     final PlotId id = new PlotId(0, 0);
 
-                    plots.get("testworld").put(id, new Plot(id, DBFunc.everyone, new ArrayList(), new ArrayList(), new ArrayList(), null, PlotHomePosition.DEFAULT, null, "testworld", new boolean[] { false, false, false, false }));
+                    plots.get("testworld").put(id, new Plot(id, DBFunc.everyone, new ArrayList(), new ArrayList(), new ArrayList(), null, PlotHomePosition.DEFAULT, null, "testworld", new boolean[]{false, false, false, false}));
 
                     return plots;
                 }
@@ -268,8 +259,7 @@ public class Test1 {
                 }
             };
             passed = true;
-        }
-        catch (final Throwable e) {
+        } catch (final Throwable e) {
 
         }
         return passed;
@@ -284,8 +274,7 @@ public class Test1 {
         try {
             PlotMain.getMain().onEnable();
             passed = true;
-        }
-        catch (final Throwable e) {
+        } catch (final Throwable e) {
 
         }
         return passed;
@@ -298,8 +287,7 @@ public class Test1 {
             final PlotManager manager = new DefaultPlotManager();
             PlotMain.addPlotWorld("poop", plotworld, manager);
             passed = (PlotMain.getPlotManager("poop") != null) && (PlotMain.getWorldSettings("poop") != null);
-        }
-        catch (final Throwable e) {
+        } catch (final Throwable e) {
 
         }
         return passed;
@@ -310,8 +298,7 @@ public class Test1 {
         try {
             new SetBlockFast();
             passed = true;
-        }
-        catch (final Throwable e) {
+        } catch (final Throwable e) {
 
         }
         return passed;