Merge gravy's pull and reformat code

Essentials/pom.xml

@@ -1,4 +1,3 @@
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

Essentials/src/net/ess3/Console.java

@@ -1,7 +1,7 @@
 package net.ess3;
 
-import net.ess3.api.IReplyTo;
 import org.bukkit.command.CommandSender;
+import net.ess3.api.IReplyTo;
 
 
 public final class Console implements IReplyTo

Essentials/src/net/ess3/Essentials.java

@@ -17,15 +17,19 @@
  */
 package net.ess3;
 
+import static net.ess3.I18n._;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.InvalidDescriptionException;
 import lombok.Getter;
 import lombok.Setter;
-import static net.ess3.I18n._;
 import net.ess3.api.*;
 import net.ess3.backup.Backup;
 import net.ess3.commands.EssentialsCommandHandler;
@@ -40,10 +44,6 @@ import net.ess3.settings.SpawnsHolder;
 import net.ess3.storage.StorageQueue;
 import net.ess3.user.UserMap;
 import net.ess3.utils.ExecuteTimer;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.InvalidDescriptionException;
 
 
 public class Essentials implements IEssentials

Essentials/src/net/ess3/EssentialsTimer.java

@@ -2,12 +2,12 @@ package net.ess3;
 
 import java.util.*;
 import java.util.logging.Level;
+import org.bukkit.entity.Player;
 import net.ess3.api.IEssentials;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
-import org.bukkit.entity.Player;
 
 
 public class EssentialsTimer implements Runnable

Essentials/src/net/ess3/I18n.java

@@ -66,7 +66,9 @@ public class I18n implements II18n
 		}
 		catch (MissingResourceException ex)
 		{
-			Logger.getLogger("Minecraft").log(Level.WARNING, String.format("Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex);
+			Logger.getLogger("Minecraft").log(
+					Level.WARNING, String.format(
+					"Missing translation key \"%s\" in translation file %s", ex.getKey(), localeBundle.getLocale().toString()), ex);
 			return defaultBundle.getString(string);
 		}
 	}
@@ -98,6 +100,7 @@ public class I18n implements II18n
 		}
 		return messageFormat.format(objects);
 	}
+
 	private final Pattern partSplit = Pattern.compile("[_\\.]");
 
 	public void updateLocale(final String loc)
@@ -127,10 +130,7 @@ public class I18n implements II18n
 
 	public static String capitalCase(final String input)
 	{
-		return input == null || input.length() == 0
+		return input == null || input.length() == 0 ? input : input.toUpperCase(Locale.ENGLISH).charAt(0) + input.toLowerCase(Locale.ENGLISH).substring(1);
-			   ? input
-			   : input.toUpperCase(Locale.ENGLISH).charAt(0)
-				 + input.toLowerCase(Locale.ENGLISH).substring(1);
 	}
 
 

Essentials/src/net/ess3/ItemDb.java

@@ -1,18 +1,18 @@
 package net.ess3;
 
+import static net.ess3.I18n._;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Pattern;
-import static net.ess3.I18n._;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IItemDb;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.storage.ManagedFile;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 
 
 public class ItemDb implements IItemDb
@@ -24,6 +24,7 @@ public class ItemDb implements IItemDb
 		this.ess = ess;
 		file = new ManagedFile("items.csv", ess);
 	}
+
 	private final transient Map<String, Long> items = new HashMap<String, Long>();
 	private final transient ManagedFile file;
 	private static final Pattern SPLIT = Pattern.compile("[^a-zA-Z0-9]");
@@ -91,6 +92,7 @@ public class ItemDb implements IItemDb
 		retval.setAmount(quantity);
 		return retval;
 	}
+
 	private final Pattern idMatch = Pattern.compile("^\\d+[:+',;.]\\d+$");
 	private final Pattern metaSplit = Pattern.compile("[:+',;.]");
 	private final Pattern number = Pattern.compile("^\\d+$");

Essentials/src/net/ess3/Jails.java

@@ -1,14 +1,13 @@
 package net.ess3;
 
+import static net.ess3.I18n._;
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IJails;
-import net.ess3.api.IUser;
-import net.ess3.storage.AsyncStorageObjectHolder;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
@@ -23,6 +22,10 @@ import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.plugin.PluginManager;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IJails;
+import net.ess3.api.IUser;
+import net.ess3.storage.AsyncStorageObjectHolder;
 
 
 public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> implements IJails
@@ -48,8 +51,7 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
 	@Override
 	public Location getJail(final String jailName) throws Exception
 	{
-		if (getData().getJails() == null || jailName == null
+		if (getData().getJails() == null || jailName == null || !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH)))
-			|| !getData().getJails().containsKey(jailName.toLowerCase(Locale.ENGLISH)))
 		{
 			throw new Exception(_("jailNotExist"));
 		}

Essentials/src/net/ess3/Kits.java

@@ -1,8 +1,9 @@
 package net.ess3;
 
+import static net.ess3.I18n._;
 import java.io.File;
 import java.util.*;
-import static net.ess3.I18n._;
+import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IKits;
 import net.ess3.api.IUser;
@@ -11,7 +12,6 @@ import net.ess3.settings.Kit;
 import net.ess3.storage.AsyncStorageObjectHolder;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> implements IKits
@@ -25,8 +25,7 @@ public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> imple
 	@Override
 	public Kit getKit(String kitName) throws Exception
 	{
-		if (getData().getKits() == null || kitName == null
+		if (getData().getKits() == null || kitName == null || !getData().getKits().containsKey(kitName.toLowerCase(Locale.ENGLISH)))
-			|| !getData().getKits().containsKey(kitName.toLowerCase(Locale.ENGLISH)))
 		{
 			throw new Exception(_("kitError2"));
 		}

Essentials/src/net/ess3/SpawnMob.java

@@ -1,16 +1,6 @@
 package net.ess3;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
-import net.ess3.api.ISettings;
-import net.ess3.api.IUser;
-import net.ess3.bukkit.LivingEntities;
-import net.ess3.bukkit.LivingEntities.MobException;
-import net.ess3.commands.NotEnoughArgumentsException;
-import net.ess3.permissions.Permissions;
-import net.ess3.user.User;
-import net.ess3.utils.LocationUtil;
-import net.ess3.utils.Util;
 import java.util.*;
 import java.util.regex.Pattern;
 import org.bukkit.DyeColor;
@@ -21,6 +11,17 @@ import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 import org.bukkit.material.Colorable;
+import net.ess3.api.IEssentials;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.bukkit.LivingEntities;
+import net.ess3.bukkit.LivingEntities.MobException;
+import net.ess3.commands.NotEnoughArgumentsException;
+import net.ess3.permissions.Permissions;
+import net.ess3.user.User;
+import net.ess3.utils.LocationUtil;
+import net.ess3.utils.Util;
+
 
 public class SpawnMob
 {

Essentials/src/net/ess3/Teleport.java

@@ -1,8 +1,11 @@
 package net.ess3;
 
+import static net.ess3.I18n._;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import static net.ess3.I18n._;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.IEssentials;
 import net.ess3.api.ITeleport;
 import net.ess3.api.IUser;
@@ -13,9 +16,6 @@ import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
 import net.ess3.utils.LocationUtil;
 import net.ess3.utils.Target;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Teleport implements Runnable, ITeleport
@@ -74,11 +74,10 @@ public class Teleport implements Runnable, ITeleport
 			return;
 		}
 
-		if (!Permissions.TELEPORT_TIMER_MOVE.isAuthorized(user) 
+		if (!Permissions.TELEPORT_TIMER_MOVE.isAuthorized(user) && (Math.round(
-			&&(Math.round(teleportUser.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX
+				teleportUser.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX || Math.round(
-			|| Math.round(teleportUser.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY
+				teleportUser.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY || Math.round(
-			|| Math.round(teleportUser.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ
+				teleportUser.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ || teleportUser.getPlayer().getHealth() < health))
-			|| teleportUser.getPlayer().getHealth() < health))
 		{    // user moved, cancel teleport
 			cancel(true);
 			return;
@@ -125,7 +124,6 @@ public class Teleport implements Runnable, ITeleport
 	}
 
 
-
 	public void cooldown(boolean check) throws Exception
 	{
 		try
@@ -214,7 +212,8 @@ public class Teleport implements Runnable, ITeleport
 		cancel();
 		user.setLastLocation();
 		final Location loc = LocationUtil.getSafeDestination(target.getLocation());
-		ess.getPlugin().scheduleSyncDelayedTask(new Runnable()
+		ess.getPlugin().scheduleSyncDelayedTask(
+				new Runnable()
 				{
 					@Override
 					public void run()
@@ -273,7 +272,8 @@ public class Teleport implements Runnable, ITeleport
 			{
 				chargeFor.charge(user);
 			}
-			return;		}
+			return;
+		}
 
 		cancel(false);
 		warnUser(otherUser, delay);
@@ -294,7 +294,8 @@ public class Teleport implements Runnable, ITeleport
 	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		final Location bed = user.getBedSpawnLocation();
-		final Location respawnLoc = ess.getPlugin().callRespawnEvent(user.getPlayer(), bed == null ? user.getPlayer().getWorld().getSpawnLocation() : bed, bed != null);
+		final Location respawnLoc = ess.getPlugin().callRespawnEvent(
+				user.getPlayer(), bed == null ? user.getPlayer().getWorld().getSpawnLocation() : bed, bed != null);
 		teleport(new Target(respawnLoc), chargeFor, cause);
 	}
 

Essentials/src/net/ess3/Warps.java

@@ -1,8 +1,9 @@
 package net.ess3;
 
+import static net.ess3.I18n._;
 import java.io.File;
 import java.util.*;
-import static net.ess3.I18n._;
+import org.bukkit.Location;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IWarp;
 import net.ess3.api.IWarps;
@@ -10,7 +11,6 @@ import net.ess3.api.InvalidNameException;
 import net.ess3.commands.WarpNotFoundException;
 import net.ess3.settings.WarpHolder;
 import net.ess3.storage.StorageObjectMap;
-import org.bukkit.Location;
 
 
 public class Warps extends StorageObjectMap<IWarp> implements IWarps

Essentials/src/net/ess3/api/Economy.java

@@ -12,11 +12,13 @@ public final class Economy
 	private Economy()
 	{
 	}
+
 	private static IEssentials ess;
 	private static final String noCallBeforeLoad = "Essentials API is called before Essentials is loaded.";
 
 	/**
 	 * Returns the balance of a user
+	 *
 	 * @param name Name of the user
 	 * @return balance
 	 * @throws UserDoesNotExistException
@@ -32,6 +34,7 @@ public final class Economy
 
 	/**
 	 * Sets the balance of a user
+	 *
 	 * @param name    Name of the user
 	 * @param balance The balance you want to set
 	 * @throws UserDoesNotExistException If a user by that name does not exists
@@ -48,6 +51,7 @@ public final class Economy
 
 	/**
 	 * Adds money to the balance of a user
+	 *
 	 * @param name   Name of the user
 	 * @param amount The money you want to add
 	 * @throws UserDoesNotExistException If a user by that name does not exists
@@ -61,6 +65,7 @@ public final class Economy
 
 	/**
 	 * Substracts money from the balance of a user
+	 *
 	 * @param name   Name of the user
 	 * @param amount The money you want to substract
 	 * @throws UserDoesNotExistException If a user by that name does not exists
@@ -74,6 +79,7 @@ public final class Economy
 
 	/**
 	 * Divides the balance of a user by a value
+	 *
 	 * @param name  Name of the user
 	 * @param value The balance is divided by this value
 	 * @throws UserDoesNotExistException If a user by that name does not exists
@@ -87,6 +93,7 @@ public final class Economy
 
 	/**
 	 * Multiplies the balance of a user by a value
+	 *
 	 * @param name  Name of the user
 	 * @param value The balance is multiplied by this value
 	 * @throws UserDoesNotExistException If a user by that name does not exists
@@ -100,6 +107,7 @@ public final class Economy
 
 	/**
 	 * Resets the balance of a user to the starting balance
+	 *
 	 * @param name Name of the user
 	 * @throws UserDoesNotExistException If a user by that name does not exists
 	 * @throws NoLoanPermittedException  If the user is not allowed to have a negative balance
@@ -148,6 +156,7 @@ public final class Economy
 
 	/**
 	 * Test if the user has a negative balance
+	 *
 	 * @param name Name of the user
 	 * @return true, if the user has a negative balance
 	 * @throws UserDoesNotExistException If a user by that name does not exists
@@ -160,6 +169,7 @@ public final class Economy
 	/**
 	 * Formats the amount of money like all other Essentials functions.
 	 * Example: $100000 or $12345.67
+	 *
 	 * @param amount The amount of money
 	 * @return Formatted money
 	 */
@@ -174,6 +184,7 @@ public final class Economy
 
 	/**
 	 * Test if a player exists to avoid the UserDoesNotExistException
+	 *
 	 * @param name Name of the user
 	 * @return true, if the user exists
 	 */
@@ -188,6 +199,7 @@ public final class Economy
 
 	/**
 	 * Test if a player is a npc
+	 *
 	 * @param name Name of the player
 	 * @return true, if it's a npc
 	 * @throws UserDoesNotExistException
@@ -203,6 +215,7 @@ public final class Economy
 
 	/**
 	 * Creates dummy files for a npc, if there is no player yet with that name.
+	 *
 	 * @param name Name of the player
 	 * @return true, if a new npc was created
 	 */
@@ -217,6 +230,7 @@ public final class Economy
 
 	/**
 	 * Deletes a user, if it is marked as npc.
+	 *
 	 * @param name Name of the player
 	 * @throws UserDoesNotExistException
 	 */

Essentials/src/net/ess3/api/IComponent.java

@@ -1,6 +1,7 @@
 package net.ess3.api;
 
-public interface IComponent extends IReload {
+public interface IComponent extends IReload
+{
 	/**
 	 * Enable the component.
 	 */

Essentials/src/net/ess3/api/IEssentials.java

@@ -2,13 +2,13 @@ package net.ess3.api;
 
 import java.util.List;
 import java.util.logging.Logger;
+import org.bukkit.Server;
+import org.bukkit.World;
 import net.ess3.EssentialsTimer;
 import net.ess3.economy.register.Methods;
 import net.ess3.metrics.Metrics;
 import net.ess3.settings.SpawnsHolder;
 import net.ess3.storage.StorageQueue;
-import org.bukkit.Server;
-import org.bukkit.World;
 
 
 public interface IEssentials extends IComponent

Essentials/src/net/ess3/api/IItemDb.java

@@ -3,7 +3,6 @@ package net.ess3.api;
 import org.bukkit.inventory.ItemStack;
 
 
-
 public interface IItemDb extends IReload
 {
 	ItemStack get(final String name, final IUser user) throws Exception;

Essentials/src/net/ess3/api/IPermission.java

@@ -10,6 +10,7 @@ public interface IPermission
 
 	/**
 	 * Checks to see if a user can use this permission
+	 *
 	 * @param sender - CommandSender to check on
 	 * @return - True if they have that permission
 	 */

Essentials/src/net/ess3/api/IPlugin.java

@@ -6,16 +6,20 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitTask;
 
-public interface IPlugin extends Plugin {
+
+public interface IPlugin extends Plugin
+{
 
 	/**
 	 * Get an instance of essentials
+	 *
 	 * @return
 	 */
 	IEssentials getEssentials();
 
 	/**
 	 * Schedule an a-sync task
+	 *
 	 * @param run - Code to call later
 	 * @return - BukkitTask for the task created
 	 */
@@ -23,6 +27,7 @@ public interface IPlugin extends Plugin {
 
 	/**
 	 * Schedule a sync task (ran in main thread) to be run
+	 *
 	 * @param run - Code to be run later
 	 * @return - Integer for the task id
 	 */
@@ -30,6 +35,7 @@ public interface IPlugin extends Plugin {
 
 	/**
 	 * Call an a-sync task to be run with a given delay
+	 *
 	 * @param run   - Code to be run
 	 * @param delay - Long that represents how long to wait
 	 * @return - BukkitTask for the task created
@@ -38,6 +44,7 @@ public interface IPlugin extends Plugin {
 
 	/**
 	 * Schedule a sync (ran in main thread) delayed task
+	 *
 	 * @param run   - Code to run
 	 * @param delay - Long that represents how long to wait
 	 * @return - Integer of the task ID
@@ -56,6 +63,7 @@ public interface IPlugin extends Plugin {
 
 	/**
 	 * Schedule an a-sync repeating task
+	 *
 	 * @param run    - Code to run
 	 * @param delay  - Delay for the first run
 	 * @param period - Time to wait between every run after the first
@@ -66,7 +74,6 @@ public interface IPlugin extends Plugin {
 	File getRootFolder();
 
 	/**
-	 * 
 	 * Stop a running task from a task id
 	 *
 	 * @param taskId
@@ -75,18 +82,21 @@ public interface IPlugin extends Plugin {
 
 	/**
 	 * Stop a running task from a bukkit task
+	 *
 	 * @param taskId
 	 */
 	void cancelTask(final BukkitTask taskId);
 
 	/**
 	 * Get the essentials version
+	 *
 	 * @return
 	 */
 	String getVersion();
 
 	/**
 	 * Load a class, currently needs updating
+	 *
 	 * @param name - class name
 	 * @return - loaded class
 	 */
@@ -94,6 +104,7 @@ public interface IPlugin extends Plugin {
 
 	/**
 	 * Call a re-spawn event on a player
+	 *
 	 * @param player   - Player to re-spawn
 	 * @param loc      - Location to send
 	 * @param bedSpawn - do you use bed?
@@ -103,12 +114,14 @@ public interface IPlugin extends Plugin {
 
 	/**
 	 * Call a suicide event on a player
+	 *
 	 * @param player - Player to kill
 	 */
 	void callSuicideEvent(Player player);
 
 	/**
 	 * Finds if an essentials module is loaded
+	 *
 	 * @param name
 	 * @return
 	 */
@@ -120,6 +133,7 @@ public interface IPlugin extends Plugin {
 
 	/**
 	 * Register a module with Essentils
+	 *
 	 * @param module - Your plugin instance
 	 */
 	void registerModule(Plugin module);

Essentials/src/net/ess3/api/IRanks.java

@@ -3,6 +3,7 @@ package net.ess3.api;
 import java.text.MessageFormat;
 import org.bukkit.command.CommandSender;
 
+
 /**
  * CommandSender object can be either IUser or Player
  */

Essentials/src/net/ess3/api/IReplyTo.java

@@ -3,7 +3,6 @@ package net.ess3.api;
 import org.bukkit.command.CommandSender;
 
 
-
 public interface IReplyTo
 {
 	void setReplyTo(CommandSender user);

Essentials/src/net/ess3/api/ITeleport.java

@@ -1,16 +1,17 @@
 package net.ess3.api;
 
-import net.ess3.economy.Trade;
-import net.ess3.utils.Target;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import net.ess3.economy.Trade;
+import net.ess3.utils.Target;
 
 
 public interface ITeleport
 {
 	/**
 	 * Teleport to a location now
+	 *
 	 * @param loc      - location to send to
 	 * @param cooldown - To check cooldown
 	 * @param cause    - Why was the send caused? Use a {@link TeleportCause}

Essentials/src/net/ess3/api/IUser.java

@@ -2,26 +2,28 @@ package net.ess3.api;
 
 import java.util.List;
 import java.util.Set;
-import net.ess3.storage.IStorageObjectHolder;
-import net.ess3.user.CooldownException;
-import net.ess3.user.UserData;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import net.ess3.storage.IStorageObjectHolder;
+import net.ess3.user.CooldownException;
+import net.ess3.user.UserData;
 
 
 public interface IUser extends OfflinePlayer, CommandSender, IStorageObjectHolder<UserData>, IReload, IReplyTo, Comparable<IUser>
 {
 	/**
 	 * Get the ammount of money in a users account
+	 *
 	 * @return
 	 */
 	double getMoney();
 
 	/**
 	 * Remove money from the account
+	 *
 	 * @param value
 	 */
 	void takeMoney(double value);
@@ -145,7 +147,7 @@ public interface IUser extends OfflinePlayer, CommandSender, IStorageObjectHolde
 
 	/**
 	 * If this is not cached using the setPlayerCache method, this call is slow and should not be called often.
-	 *
+	 * <p/>
 	 * It iterates over all players, that are online and does a equal check on their names.
 	 *
 	 * @return

Essentials/src/net/ess3/api/IUserMap.java

@@ -2,9 +2,9 @@ package net.ess3.api;
 
 import java.io.File;
 import java.util.Set;
+import org.bukkit.entity.Player;
 import net.ess3.user.PlayerNotFoundException;
 import net.ess3.user.TooManyMatchesException;
-import org.bukkit.entity.Player;
 
 
 public interface IUserMap extends IReload

Essentials/src/net/ess3/api/IWarp.java

@@ -3,6 +3,7 @@ package net.ess3.api;
 import net.ess3.settings.Warp;
 import net.ess3.storage.IStorageObjectHolder;
 
+
 /**
  * Warp interface
  */

Essentials/src/net/ess3/api/IWarps.java

@@ -9,6 +9,7 @@ public interface IWarps extends IReload
 {
 	/**
 	 * Get a warp by name
+	 *
 	 * @param warp - Warp name
 	 * @return - Location the warp is set to
 	 * @throws Exception
@@ -17,12 +18,14 @@ public interface IWarps extends IReload
 
 	/**
 	 * Gets a list of warps
+	 *
 	 * @return - A {@link Collection} of warps
 	 */
 	Collection<String> getList();
 
 	/**
 	 * Delete a warp from the warp DB
+	 *
 	 * @param name - Name of warp
 	 * @throws Exception
 	 */
@@ -30,6 +33,7 @@ public interface IWarps extends IReload
 
 	/**
 	 * Set a warp
+	 *
 	 * @param name - Name of warp
 	 * @param loc  - Location of warp
 	 * @throws Exception
@@ -45,6 +49,7 @@ public interface IWarps extends IReload
 
 	/**
 	 * Get a warp file
+	 *
 	 * @param name - name of file
 	 * @return - an instance of the file
 	 * @throws InvalidNameException - When the file is not found

Essentials/src/net/ess3/api/IWorth.java

@@ -7,6 +7,7 @@ public interface IWorth extends IReload
 {
 	/**
 	 * Get the price of an ItemStack
+	 *
 	 * @param itemStack - ItemStack to check
 	 * @return - double marking price
 	 */
@@ -14,6 +15,7 @@ public interface IWorth extends IReload
 
 	/**
 	 * Set the price of an ItemStack
+	 *
 	 * @param itemStack - ItemStack to set price for
 	 * @param price     - Price to set on item
 	 */

Essentials/src/net/ess3/backup/Backup.java

@@ -1,16 +1,16 @@
 package net.ess3.backup;
 
+import static net.ess3.I18n._;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
-import static net.ess3.I18n._;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IBackup;
 import net.ess3.api.IEssentials;
 import net.ess3.api.ISettings;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
 
 
 public class Backup implements Runnable, IBackup
@@ -59,8 +59,7 @@ public class Backup implements Runnable, IBackup
 
 		final net.ess3.settings.Backup backupSettings = settings.getData().getGeneral().getBackup();
 
-		String backupCommand = backupSettings.getCommand() == null || backupSettings.getCommand().isEmpty()
+		String backupCommand = backupSettings.getCommand() == null || backupSettings.getCommand().isEmpty() ? ("NORUN") : backupSettings.getCommand();
-				? ("NORUN")  : backupSettings.getCommand();
 		
 		/*if (backupCommand.equals("NORUN")) { TODO: Un-comment if you do not want commands to be run if there is no backup command
 			return;
@@ -71,7 +70,8 @@ public class Backup implements Runnable, IBackup
 		if (!backupSettings.getCommandsBeforeBackup().isEmpty())
 		{
 			final CommandSender consoleSender = server.getConsoleSender();
-			for (String command : backupSettings.getCommandsBeforeBackup()) {
+			for (String command : backupSettings.getCommandsBeforeBackup())
+			{
 				server.dispatchCommand(consoleSender, command);
 			}
 		}

Essentials/src/net/ess3/bukkit/BukkitPlugin.java

@@ -1,21 +1,12 @@
 package net.ess3.bukkit;
 
+import static net.ess3.I18n._;
 import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
-import net.ess3.Essentials;
-import static net.ess3.I18n._;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IPlugin;
-import net.ess3.listener.EssentialsBlockListener;
-import net.ess3.listener.EssentialsEntityListener;
-import net.ess3.listener.EssentialsPlayerListener;
-import net.ess3.listener.EssentialsPluginListener;
-import net.ess3.metrics.MetricsListener;
-import net.ess3.metrics.MetricsStarter;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -31,6 +22,15 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitTask;
+import net.ess3.Essentials;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IPlugin;
+import net.ess3.listener.EssentialsBlockListener;
+import net.ess3.listener.EssentialsEntityListener;
+import net.ess3.listener.EssentialsPlayerListener;
+import net.ess3.listener.EssentialsPluginListener;
+import net.ess3.metrics.MetricsListener;
+import net.ess3.metrics.MetricsStarter;
 
 
 public class BukkitPlugin extends JavaPlugin implements IPlugin
@@ -62,7 +62,8 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin
 					getLogger().log(Level.SEVERE, _("essentialsHelp2"));
 				}
 				getLogger().log(Level.SEVERE, ex.toString());
-				pm.registerEvents(new Listener()
+				pm.registerEvents(
+						new Listener()
 						{
 							@EventHandler(priority = EventPriority.LOW)
 							public void onPlayerJoin(final PlayerJoinEvent event)
@@ -228,8 +229,7 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin
 	@Override
 	public void onPluginEnable(final Plugin plugin)
 	{
-		if (plugin.getName().equals(this.getName())
+		if (plugin.getName().equals(this.getName()) || !plugin.getName().startsWith("Essentials"))
-			|| !plugin.getName().startsWith("Essentials"))
 		{
 			return;
 		}
@@ -246,8 +246,7 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin
 	@Override
 	public void onPluginDisable(final Plugin plugin)
 	{
-		if (plugin.getName().equals(this.getName())
+		if (plugin.getName().equals(this.getName()) || !plugin.getName().startsWith("Essentials"))
-			|| !plugin.getName().startsWith("Essentials"))
 		{
 			return;
 		}

Essentials/src/net/ess3/bukkit/Enchantments.java

@@ -113,11 +113,15 @@ public final class Enchantments
 		ENCHANTMENTS.put("unlimitedarrows", Enchantment.ARROW_INFINITE);
 	}
 
-	public static Enchantment getByName(final String name) {
+	public static Enchantment getByName(final String name)
+	{
 		Enchantment enchantment;
-		if (NUMPATTERN.matcher(name).matches()) {
+		if (NUMPATTERN.matcher(name).matches())
+		{
 			enchantment = Enchantment.getById(Integer.parseInt(name));
-		} else {
+		}
+		else
+		{
 			enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH));
 		}
 		if (enchantment == null)

Essentials/src/net/ess3/bukkit/LivingEntities.java

@@ -1,12 +1,7 @@
 package net.ess3.bukkit;
 
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
 import static net.ess3.I18n._;
+import java.util.*;
 import org.bukkit.entity.EntityType;
 
 
@@ -41,7 +36,8 @@ public class LivingEntities
 		return entities.get(name.toLowerCase(Locale.ENGLISH));
 	}
 
-	public static String getName(int count, EntityType type) {
+	public static String getName(int count, EntityType type)
+	{
 		return count == 1 ? _(entityI18n.get(type)) : _(entityI18nPlural.get(type));
 	}
 

Essentials/src/net/ess3/bukkit/PermissionFactory.java

@@ -1,12 +1,12 @@
 package net.ess3.bukkit;
 
 import java.util.StringTokenizer;
-import net.ess3.api.IPermission;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.PluginManager;
+import net.ess3.api.IPermission;
 
 
 public class PermissionFactory

Essentials/src/net/ess3/bukkit/VersionCheck.java

@@ -1,17 +1,18 @@
 package net.ess3.bukkit;
 
+import static net.ess3.I18n._;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import static net.ess3.I18n._;
 import org.bukkit.plugin.PluginManager;
 
 
 public class VersionCheck
 {
 	public static final int BUKKIT_VERSION = 2015;
-	private static final Pattern bukkitVersionPattern = Pattern.compile("git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*");
+	private static final Pattern bukkitVersionPattern = Pattern.compile(
+			"git-Bukkit-(?:(?:[0-9]+)\\.)+[0-9]+-R[\\.0-9]+-(?:[0-9]+-g[0-9a-f]+-)?b([0-9]+)jnks.*");
 
 	public static boolean checkVersion(final org.bukkit.plugin.Plugin plugin)
 	{
@@ -20,8 +21,7 @@ public class VersionCheck
 		final Logger log = plugin.getLogger();
 		for (org.bukkit.plugin.Plugin p : pm.getPlugins())
 		{
-			if (p.getDescription().getName().startsWith("Essentials")
+			if (p.getDescription().getName().startsWith("Essentials") && !p.getDescription().getVersion().equals(pluginVersion))
-				&& !p.getDescription().getVersion().equals(pluginVersion))
 			{
 				p.getLogger().log(Level.WARNING, _("versionMismatch", p.getDescription().getName()));
 			}

Essentials/src/net/ess3/commands/Commandbackup.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IBackup;
 import org.bukkit.command.CommandSender;
+import net.ess3.api.IBackup;
 
 
 public class Commandbackup extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbalance.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandbalance extends EssentialsCommand
@@ -22,10 +22,7 @@ public class Commandbalance extends EssentialsCommand
 	@Override
 	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		final double bal = (args.length < 1
+		final double bal = (args.length < 1 || !Permissions.BALANCE_OTHERS.isAuthorized(user) ? user : ess.getUserMap().matchUser(args[0], true)).getMoney();
-							|| !Permissions.BALANCE_OTHERS.isAuthorized(user)
-							? user
-							: ess.getUserMap().matchUser(args[0], true)).getMoney();
 		user.sendMessage(_("balance", FormatUtil.displayCurrency(bal, ess)));
 	}
 }

Essentials/src/net/ess3/commands/Commandbalancetop.java

@@ -1,17 +1,17 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData;
 import net.ess3.utils.FormatUtil;
 import net.ess3.utils.textreader.ArrayListInput;
 import net.ess3.utils.textreader.TextPager;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandbalancetop extends EssentialsCommand
@@ -43,9 +43,7 @@ public class Commandbalancetop extends EssentialsCommand
 						user.getData().setBalancetopHide(!user.getData().isBalancetopHide());
 						user.queueSave();
 						sender.sendMessage(
-								user.getData().isBalancetopHide()
+								user.getData().isBalancetopHide() ? _("baltopHidden") : _("baltopShown"));
-								? _("baltopHidden")
-								: _("baltopShown")); 
 					}
 					else if (args.length == 2 && Permissions.BALANCETOP_HIDE_OTHERS.isAuthorized(sender))
 					{
@@ -54,9 +52,7 @@ public class Commandbalancetop extends EssentialsCommand
 						userData.setBalancetopHide(!userData.isBalancetopHide());
 						user.queueSave();
 						sender.sendMessage(
-								userData.isBalancetopHide()
+								userData.isBalancetopHide() ? user.getName() + _("userBaltopHidden") : user.getName() + _("userBaltopShown"));
-								? user.getName() + _("userBaltopHidden")
-								: user.getName() + _("userBaltopShown")); 
 					}
 					else
 					{
@@ -149,7 +145,8 @@ public class Commandbalancetop extends EssentialsCommand
 					}
 
 					final List<Map.Entry<String, Double>> sortedEntries = new ArrayList<Map.Entry<String, Double>>(balances.entrySet());
-					Collections.sort(sortedEntries, new Comparator<Map.Entry<String, Double>>()
+					Collections.sort(
+							sortedEntries, new Comparator<Map.Entry<String, Double>>()
 					{
 						@Override
 						public int compare(final Entry<String, Double> entry1, final Entry<String, Double> entry2)

Essentials/src/net/ess3/commands/Commandban.java

@@ -1,15 +1,14 @@
 package net.ess3.commands;
 
-import net.ess3.Console;
 import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import net.ess3.Console;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.Ban;
 import net.ess3.user.UserData;
 
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 
 public class Commandban extends EssentialsCommand
 {

Essentials/src/net/ess3/commands/Commandbanip.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
+import net.ess3.api.IUser;
 
 
 public class Commandbanip extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbigtree.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.utils.LocationUtil;
 import org.bukkit.Location;
 import org.bukkit.TreeType;
+import net.ess3.api.IUser;
+import net.ess3.utils.LocationUtil;
 
 
 public class Commandbigtree extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandbreak.java

@@ -1,11 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+
 
 public class Commandbreak extends EssentialsCommand
 {

Essentials/src/net/ess3/commands/Commandbroadcast.java

@@ -1,9 +1,8 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.utils.FormatUtil;
 import org.bukkit.command.CommandSender;
-
+import net.ess3.utils.FormatUtil;
 
 
 public class Commandbroadcast extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandburn.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.api.IUser;
 
 
 public class Commandburn extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandclearinventory.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import java.util.List;
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
+import java.util.List;
-import net.ess3.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandclearinventory extends EssentialsCommand

Essentials/src/net/ess3/commands/Commanddelhome.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
-import org.bukkit.command.CommandSender;
 
 
 public class Commanddelhome extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandeco.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import java.util.Locale;
 import static net.ess3.I18n._;
-import net.ess3.api.ISettings;
+import java.util.Locale;
-import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
 
 
 public class Commandeco extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandenchant.java

@@ -1,17 +1,17 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import static net.ess3.I18n._;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IUser;
 import net.ess3.bukkit.Enchantments;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandenchant extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandenderchest.java

@@ -1,7 +1,6 @@
 package net.ess3.commands;
 
 import org.bukkit.entity.Player;
-
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 

Essentials/src/net/ess3/commands/Commandessentials.java

@@ -1,7 +1,7 @@
 package net.ess3.commands;
 
-import java.util.Map;
 import static net.ess3.I18n._;
+import java.util.Map;
 import org.bukkit.command.CommandSender;
 
 

Essentials/src/net/ess3/commands/Commandexp.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.craftbukkit.SetExpFix;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandexp extends EssentialsCommand
@@ -115,8 +115,10 @@ public class Commandexp extends EssentialsCommand
 	private void showExp(final CommandSender sender, final IUser target)
 	{
 		final int totalExp = SetExpFix.getTotalExperience(target.getPlayer());
-		final int expLeft = (int)Util.roundDouble(((((3.5 * target.getPlayer().getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getPlayer().getLevel() * target.getPlayer().getLevel())) + (5.00 * target.getPlayer().getLevel())))) + 1));
+		final int expLeft = (int)Util.roundDouble(
-		sender.sendMessage(_("exp", target.getPlayer().getDisplayName(), SetExpFix.getTotalExperience(target.getPlayer()), target.getPlayer().getLevel(), expLeft));
+				((((3.5 * target.getPlayer().getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getPlayer().getLevel() * target.getPlayer().getLevel())) + (5.00 * target.getPlayer().getLevel())))) + 1));
+		sender.sendMessage(
+				_("exp", target.getPlayer().getDisplayName(), SetExpFix.getTotalExperience(target.getPlayer()), target.getPlayer().getLevel(), expLeft));
 	}
 
 	private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give)

Essentials/src/net/ess3/commands/Commandext.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.api.IUser;
 
 
 public class Commandext extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandfeed.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import java.util.Set;
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
+import java.util.Set;
-import net.ess3.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandfeed extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandfireball.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
-import net.ess3.api.IUser;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.SmallFireball;
 import org.bukkit.util.Vector;
+import net.ess3.api.IUser;
 
 
 public class Commandfireball extends EssentialsCommand
@@ -21,7 +21,8 @@ public class Commandfireball extends EssentialsCommand
 		final Player player = user.getPlayer();
 
 		final Vector direction = player.getEyeLocation().getDirection().multiply(2);
-		final Fireball fireball = player.getWorld().spawn(player.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class);
+		final Fireball fireball = player.getWorld().spawn(
+				player.getEyeLocation().add(direction.getX(), direction.getY(), direction.getZ()), small ? SmallFireball.class : Fireball.class);
 		fireball.setShooter(player);
 	}
 }

Essentials/src/net/ess3/commands/Commandgamemode.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import java.util.Locale;
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
+import java.util.Locale;
-import net.ess3.permissions.Permissions;
 import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandgamemode extends EssentialsSettingsCommand
@@ -13,7 +13,8 @@ public class Commandgamemode extends EssentialsSettingsCommand
 
 	protected void setValue(final IUser player, GameMode value)
 	{
-		if (value == null) {
+		if (value == null)
+		{
 			value = rotateGameMode(player);
 		}
 		player.getPlayer().setGameMode(value);
@@ -26,10 +27,12 @@ public class Commandgamemode extends EssentialsSettingsCommand
 
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
-		if (value) {
+		if (value)
+		{
 			sender.sendMessage(_("gameMode", getValue(player).toString().toLowerCase(Locale.ENGLISH), player.getPlayer().getDisplayName()));
 		}
-		else {
+		else
+		{
 			sender.sendMessage(_("gamemodeFailed", player.getName()));
 		}
 	}
@@ -57,11 +60,13 @@ public class Commandgamemode extends EssentialsSettingsCommand
 
 	protected boolean canMatch(final String arg)
 	{
-		try {
+		try
+		{
 			matchGameMode(arg);
 			return true;
 		}
-		catch (NotEnoughArgumentsException ex) {
+		catch (NotEnoughArgumentsException ex)
+		{
 			return false;
 		}
 	}
@@ -72,35 +77,37 @@ public class Commandgamemode extends EssentialsSettingsCommand
 		{
 			setValue(player, null);
 		}
-		else {
+		else
+		{
 			setValue(player, matchGameMode(arg));
 		}
 	}
 
-	private GameMode rotateGameMode(final IUser player) {
+	private GameMode rotateGameMode(final IUser player)
+	{
 		return getValue(player) == GameMode.SURVIVAL ? GameMode.CREATIVE : getValue(player) == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL;
 	}
 
 	private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException
 	{
 		final GameMode mode;
-		if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc")
+		if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc") || modeString.contains("creat") || modeString.equalsIgnoreCase(
-			|| modeString.contains("creat") || modeString.equalsIgnoreCase("1") || modeString.equalsIgnoreCase("c"))
+				"1") || modeString.equalsIgnoreCase("c"))
 		{
 			mode = GameMode.CREATIVE;
 		}
-		else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms")
+		else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms") || modeString.contains("survi") || modeString.equalsIgnoreCase(
-				 || modeString.contains("survi") || modeString.equalsIgnoreCase("0") || modeString.equalsIgnoreCase("s"))
+				"0") || modeString.equalsIgnoreCase("s"))
 		{
 			mode = GameMode.SURVIVAL;
 		}
-		else if (modeString.equalsIgnoreCase("gma") || modeString.equalsIgnoreCase("egma")
+		else if (modeString.equalsIgnoreCase("gma") || modeString.equalsIgnoreCase("egma") || modeString.contains("advent") || modeString.equalsIgnoreCase(
-				 || modeString.contains("advent") || modeString.equalsIgnoreCase("2") || modeString.equalsIgnoreCase("a"))
+				"2") || modeString.equalsIgnoreCase("a"))
 		{
 			mode = GameMode.ADVENTURE;
 		}
-		else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt")
+		else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt") || modeString.contains("toggle") || modeString.contains(
-				 || modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t"))
+				"cycle") || modeString.equalsIgnoreCase("t"))
 		{
 			mode = null;
 		}

Essentials/src/net/ess3/commands/Commandgc.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import java.lang.management.ManagementFactory;
 import static net.ess3.I18n._;
-import net.ess3.utils.DateUtil;
+import java.lang.management.ManagementFactory;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
+import net.ess3.utils.DateUtil;
 
 
 public class Commandgc extends EssentialsCommand
@@ -53,9 +53,7 @@ public class Commandgc extends EssentialsCommand
 			}
 
 			sender.sendMessage(
-					worldType + " \"" + w.getName() + "\": "
+					worldType + " \"" + w.getName() + "\": " + w.getLoadedChunks().length + _("gcchunks") + w.getEntities().size() + _("gcentities"));
-					+ w.getLoadedChunks().length + _("gcchunks")
-					+ w.getEntities().size() + _("gcentities"));
 		}
 	}
 }

Essentials/src/net/ess3/commands/Commandgetpos.java

@@ -1,14 +1,12 @@
 package net.ess3.commands;
 
-import net.ess3.api.IUser;
+import static net.ess3.I18n._;
-import net.ess3.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-
+import net.ess3.api.IUser;
-import static net.ess3.I18n._;
+import net.ess3.permissions.Permissions;
-
 
 
 public class Commandgetpos extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandgive.java

@@ -1,14 +1,14 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
-import net.ess3.utils.Util;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.utils.Util;
 
 
 public class Commandgive extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandhat.java

@@ -1,13 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.craftbukkit.InventoryWorkaround;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
-
+import net.ess3.api.IUser;
+import net.ess3.craftbukkit.InventoryWorkaround;
 
 
 public class Commandhat extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandheal.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import java.util.Set;
 import static net.ess3.I18n._;
+import java.util.Set;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandheal extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandhelp.java

@@ -1,12 +1,11 @@
 package net.ess3.commands;
 
-import java.util.Locale;
 import static net.ess3.I18n._;
+import java.util.Locale;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.utils.Util;
 import net.ess3.utils.textreader.*;
-import org.bukkit.command.CommandSender;
-
 
 
 public class Commandhelp extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandhelpop.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import java.util.logging.Level;
 import static net.ess3.I18n._;
+import java.util.logging.Level;
+import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
-import org.bukkit.entity.Player;
 
 
 public class Commandhelpop extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandhome.java

@@ -1,16 +1,16 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.Set;
 import java.util.regex.Pattern;
-import static net.ess3.I18n._;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandhome extends EssentialsCommand
@@ -99,8 +99,8 @@ public class Commandhome extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		if (user.getPlayer().getWorld() != loc.getWorld() && ess.getSettings().getData().getGeneral().isWorldHomePermissions()
+		if (user.getPlayer().getWorld() != loc.getWorld() && ess.getSettings().getData().getGeneral().isWorldHomePermissions() && !Permissions.WORLD.isAuthorized(
-			&& !Permissions.WORLD.isAuthorized(user, loc.getWorld().getName()))
+				user, loc.getWorld().getName()))
 		{
 			throw new Exception(_("noPerm", "essentials.world." + loc.getWorld().getName()));
 		}

Essentials/src/net/ess3/commands/Commandignore.java

@@ -15,13 +15,19 @@ public class Commandignore extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		IUser player;
-		try {
+		try
+		{
 			player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer());
-		} catch(Exception e) {
+		}
-			if (args[0].equalsIgnoreCase("list")) {
+		catch (Exception e)
+		{
+			if (args[0].equalsIgnoreCase("list"))
+			{
 				user.sendMessage(Util.joinList(user.getData().getIgnore()));
 				throw new NoChargeException();
-			} else {
+			}
+			else
+			{
 				throw e;
 			}
 		}

Essentials/src/net/ess3/commands/Commandinfo.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
+import org.bukkit.command.CommandSender;
 import net.ess3.utils.textreader.IText;
 import net.ess3.utils.textreader.KeywordReplacer;
 import net.ess3.utils.textreader.TextInput;
 import net.ess3.utils.textreader.TextPager;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandinfo extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandinvsee.java

@@ -1,11 +1,10 @@
 package net.ess3.commands;
 
-import java.util.Arrays;
 import static net.ess3.I18n._;
+import java.util.Arrays;
+import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IUser;
 import net.ess3.user.Inventory;
-import org.bukkit.inventory.ItemStack;
-
 
 
 public class Commandinvsee extends EssentialsCommand

Essentials/src/net/ess3/commands/Commanditem.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commanditem extends EssentialsCommand

Essentials/src/net/ess3/commands/Commanditemdb.java

@@ -1,12 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.ItemStack;
-
+import net.ess3.api.IUser;
 
 
 public class Commanditemdb extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandjails.java

@@ -1,9 +1,8 @@
 package net.ess3.commands;
 
-import net.ess3.utils.Util;
-
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
+import net.ess3.utils.Util;
 
 
 public class Commandjails extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandjump.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import org.bukkit.Location;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.utils.LocationUtil;
-import org.bukkit.Location;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class Commandjump extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandkick.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
-import net.ess3.Console;
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.Console;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandkick extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandkickall.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.api.IUser;
 
 
 public class Commandkickall extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandkill.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandkill extends EssentialsCommand
@@ -21,7 +21,9 @@ public class Commandkill extends EssentialsCommand
 		for (IUser matchPlayer : ess.getUserMap().matchUsersExcludingHidden(args[0], getPlayerOrNull(sender)))
 		{
 			final Player player = matchPlayer.getPlayer();
-			final EntityDamageEvent ede = new EntityDamageEvent(player, sender instanceof IUser && sender.getName().equals(matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE);
+			final EntityDamageEvent ede = new EntityDamageEvent(
+					player, sender instanceof IUser && sender.getName().equals(
+					matchPlayer.getName()) ? EntityDamageEvent.DamageCause.SUICIDE : EntityDamageEvent.DamageCause.CUSTOM, Short.MAX_VALUE);
 			server.getPluginManager().callEvent(ede);
 			if (ede.isCancelled() && Permissions.KILL_FORCE.isAuthorized(sender))
 			{

Essentials/src/net/ess3/commands/Commandkillall.java

@@ -1,9 +1,8 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.Collections;
 import java.util.Locale;
-import static net.ess3.I18n._;
-import net.ess3.bukkit.LivingEntities;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -11,6 +10,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.inventory.ItemStack;
+import net.ess3.bukkit.LivingEntities;
 
 
 public class Commandkillall extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandkit.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.Collection;
 import java.util.Locale;
-import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;

Essentials/src/net/ess3/commands/Commandlightning.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.ISettings;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.LightningStrike;
 import org.bukkit.entity.Player;
+import net.ess3.api.ISettings;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandlightning extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandlist.java

@@ -1,13 +1,13 @@
 package net.ess3.commands;
 
-import java.util.*;
 import static net.ess3.I18n._;
+import java.util.*;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandlist extends EssentialsCommand
@@ -59,8 +59,7 @@ public class Commandlist extends EssentialsCommand
 			final Set<String> hiddenPlayers = new HashSet<String>();
 			for (Player onlinePlayer : server.getOnlinePlayers())
 			{
-				if (userPlayer != null
+				if (userPlayer != null && !userPlayer.canSee(onlinePlayer))
-					&& !userPlayer.canSee(onlinePlayer))
 				{
 					hiddenPlayers.add(onlinePlayer.getName());
 					if (!showhidden)
@@ -118,8 +117,7 @@ public class Commandlist extends EssentialsCommand
 			final Set<String> hiddenPlayers = new HashSet<String>();
 			for (Player onlinePlayer : server.getOnlinePlayers())
 			{
-				if (userPlayer != null
+				if (userPlayer != null && !userPlayer.canSee(onlinePlayer))
-					&& !userPlayer.canSee(onlinePlayer))
 				{
 					hiddenPlayers.add(onlinePlayer.getName());
 					if (!showhidden)

Essentials/src/net/ess3/commands/Commandmail.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import java.util.List;
 import static net.ess3.I18n._;
+import java.util.List;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
 import net.ess3.utils.Util;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandmail extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmore.java

@@ -1,16 +1,15 @@
 package net.ess3.commands;
 
-import java.util.Locale;
 import static net.ess3.I18n._;
+import java.util.Locale;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import net.ess3.api.ChargeException;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
 
 public class Commandmore extends EssentialsCommand
 {
@@ -25,8 +24,7 @@ public class Commandmore extends EssentialsCommand
 		}
 		else
 		{
-			stacks = new ItemStack[]
+			stacks = new ItemStack[]{
-			{
 					player.getItemInHand()
 			};
 		}
@@ -48,9 +46,8 @@ public class Commandmore extends EssentialsCommand
 			final int defaultStackSize = settings.getData().getGeneral().getDefaultStacksize();
 			final int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize();
 
-			int newAmount = Permissions.OVERSIZEDSTACKS.isAuthorized(user)
+			int newAmount = Permissions.OVERSIZEDSTACKS.isAuthorized(
-							? oversizedStackSize
+					user) ? oversizedStackSize : defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize();
-							: defaultStackSize > 0 ? defaultStackSize : stack.getMaxStackSize();
 			if (stack.getAmount() >= newAmount)
 			{
 				if (stacks.length == 1)

Essentials/src/net/ess3/commands/Commandmotd.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
+import org.bukkit.command.CommandSender;
 import net.ess3.utils.textreader.IText;
 import net.ess3.utils.textreader.KeywordReplacer;
 import net.ess3.utils.textreader.TextInput;
 import net.ess3.utils.textreader.TextPager;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandmotd extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmsg.java

@@ -1,14 +1,14 @@
 package net.ess3.commands;
 
-import java.util.Set;
-import net.ess3.Console;
 import static net.ess3.I18n._;
+import java.util.Set;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import net.ess3.Console;
 import net.ess3.api.IReplyTo;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandmsg extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandmute.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandmute extends EssentialsCommand
@@ -38,16 +38,10 @@ public class Commandmute extends EssentialsCommand
 		player.setTimestamp(TimestampType.MUTE, muteTimestamp);
 		final boolean muted = player.getData().isMuted();
 		sender.sendMessage(
-				muted
+				muted ? (muteTimestamp > 0 ? _("mutedPlayerFor", player.getPlayer().getDisplayName(), DateUtil.formatDateDiff(muteTimestamp)) : _(
-				? (muteTimestamp > 0
+						"mutedPlayer", player.getPlayer().getDisplayName())) : _(
-				   ? _("mutedPlayerFor", player.getPlayer().getDisplayName(), DateUtil.formatDateDiff(muteTimestamp))
+						"unmutedPlayer", player.getPlayer().getDisplayName()));
-				   : _("mutedPlayer", player.getPlayer().getDisplayName()))
-				: _("unmutedPlayer", player.getPlayer().getDisplayName()));
 		player.sendMessage(
-				muted
+				muted ? (muteTimestamp > 0 ? _("playerMutedFor", DateUtil.formatDateDiff(muteTimestamp)) : _("playerMuted")) : _("playerUnmuted"));
-				? (muteTimestamp > 0
-				   ? _("playerMutedFor", DateUtil.formatDateDiff(muteTimestamp))
-				   : _("playerMuted"))
-				: _("playerUnmuted"));
 	}
 }

Essentials/src/net/ess3/commands/Commandnear.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandnear extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandnick.java

@@ -1,14 +1,14 @@
 package net.ess3.commands;
 
-import java.util.Locale;
 import static net.ess3.I18n._;
+import java.util.Locale;
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandnick extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandpay.java

@@ -5,7 +5,6 @@ import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 
 
-
 public class Commandpay extends EssentialsCommand
 {
 	@Override
@@ -18,7 +17,8 @@ public class Commandpay extends EssentialsCommand
 
 		final double amount = Double.parseDouble(args[1].replaceAll("[^0-9\\.]", ""));
 
-		if (amount <= 0 || Double.isNaN(amount) || Double.isInfinite(amount)) {
+		if (amount <= 0 || Double.isNaN(amount) || Double.isInfinite(amount))
+		{
 			user.sendMessage(_("invalidAmount"));
 		}
 
@@ -26,7 +26,9 @@ public class Commandpay extends EssentialsCommand
 		for (IUser u : ess.getUserMap().matchUsers(args[0], true))
 		{
 			user.payUser(u, amount);
-			Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), u.getName(), new Trade(amount, ess), user.getPlayer().getLocation(), ess);
+			Trade.log(
+					"Command", "Pay", "Player", user.getName(), new Trade(amount, ess), u.getName(), new Trade(amount, ess), user.getPlayer().getLocation(),
+					ess);
 			foundUser = true;
 		}
 

Essentials/src/net/ess3/commands/Commandpowertool.java

@@ -1,15 +1,15 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import static net.ess3.I18n._;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.UserData;
 import net.ess3.utils.Util;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandpowertool extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandpowertooltoggle.java

@@ -18,8 +18,7 @@ public class Commandpowertooltoggle extends EssentialsCommand
 		}
 		userData.setPowerToolsEnabled(!userData.isPowerToolsEnabled());
 		user.queueSave();
-		user.sendMessage(userData.isPowerToolsEnabled()
+		user.sendMessage(
-						 ? _("powerToolsEnabled")
+				userData.isPowerToolsEnabled() ? _("powerToolsEnabled") : _("powerToolsDisabled"));
-						 : _("powerToolsDisabled"));
 	}
 }

Essentials/src/net/ess3/commands/Commandptime.java

@@ -1,13 +1,13 @@
 package net.ess3.commands;
 
-import java.util.*;
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
+import java.util.*;
-import net.ess3.permissions.Permissions;
-import net.ess3.utils.DescParseTickFormat;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.utils.DescParseTickFormat;
 
 
 public class Commandptime extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandr.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import net.ess3.Console;
 import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
+import net.ess3.Console;
 import net.ess3.api.IReplyTo;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.FormatUtil;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandr extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandrealname.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
-import java.util.Locale;
 import static net.ess3.I18n._;
+import java.util.Locale;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import net.ess3.api.IUser;
 import net.ess3.api.IUserMap;
 import net.ess3.utils.FormatUtil;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Commandrealname extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandrecipe.java

@@ -1,17 +1,16 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-
-import net.ess3.api.IUser;
-import net.ess3.utils.Util;
-import org.bukkit.Material;
-import org.bukkit.command.CommandSender;
-import org.bukkit.inventory.*;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.inventory.*;
+import net.ess3.api.IUser;
+import net.ess3.utils.Util;
+
 
 public class Commandrecipe extends EssentialsCommand
 {

Essentials/src/net/ess3/commands/Commandremove.java

@@ -1,12 +1,13 @@
 package net.ess3.commands;
 
-import java.util.Locale;
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
+import java.util.Locale;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
+import net.ess3.api.IUser;
+
 
 //Todo: Fix this up
 public class Commandremove extends EssentialsCommand
@@ -100,7 +101,8 @@ public class Commandremove extends EssentialsCommand
 						continue;
 					}
 				}
-				switch (toRemove) {
+				switch (toRemove)
+				{
 				case DROPS:
 					if (e instanceof Item)
 					{

Essentials/src/net/ess3/commands/Commandrepair.java

@@ -1,16 +1,16 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import static net.ess3.I18n._;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 
 
 public class Commandrepair extends EssentialsCommand
@@ -31,8 +31,7 @@ public class Commandrepair extends EssentialsCommand
 				throw new Exception(_("repairInvalidType"));
 			}
 
-			if (!item.getEnchantments().isEmpty()
+			if (!item.getEnchantments().isEmpty() && !Permissions.REPAIR_ENCHANTED.isAuthorized(user))
-				&& !Permissions.REPAIR_ENCHANTED.isAuthorized(user))
 			{
 				throw new Exception(_("repairEnchanted"));
 			}
@@ -112,8 +111,7 @@ public class Commandrepair extends EssentialsCommand
 				user.sendMessage(ex.getMessage());
 				continue;
 			}
-			if (!item.getEnchantments().isEmpty()
+			if (!item.getEnchantments().isEmpty() && !Permissions.REPAIR_ENCHANTED.isAuthorized(user))
-				&& !Permissions.REPAIR_ENCHANTED.isAuthorized(user))
 			{
 				continue;
 			}

Essentials/src/net/ess3/commands/Commandrules.java

@@ -1,10 +1,10 @@
 package net.ess3.commands;
 
+import org.bukkit.command.CommandSender;
 import net.ess3.utils.textreader.IText;
 import net.ess3.utils.textreader.KeywordReplacer;
 import net.ess3.utils.textreader.TextInput;
 import net.ess3.utils.textreader.TextPager;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandrules extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandseen.java

@@ -1,12 +1,13 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import net.ess3.user.PlayerNotFoundException;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
-import org.bukkit.command.CommandSender;
+
 
 public class Commandseen extends EssentialsCommand
 {

Essentials/src/net/ess3/commands/Commandsell.java

@@ -1,16 +1,15 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.logging.Level;
-import static net.ess3.I18n._;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IUser;
 import net.ess3.craftbukkit.InventoryWorkaround;
 import net.ess3.economy.Trade;
 import net.ess3.utils.FormatUtil;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
 
 
 public class Commandsell extends EssentialsCommand
@@ -148,8 +147,14 @@ public class Commandsell extends EssentialsCommand
 		player.updateInventory();
 		Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(worth * amount, ess), player.getLocation(), ess);
 		user.giveMoney(worth * amount);
-		user.sendMessage(_("itemSold", FormatUtil.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), FormatUtil.displayCurrency(worth, ess)));
+		user.sendMessage(
-		logger.log(Level.INFO, _("itemSoldConsole", player.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess)));
+				_(
+						"itemSold", FormatUtil.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH),
+						FormatUtil.displayCurrency(worth, ess)));
+		logger.log(
+				Level.INFO, _(
+				"itemSoldConsole", player.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH),
+				FormatUtil.displayCurrency(worth * amount, ess), amount, FormatUtil.displayCurrency(worth, ess)));
 
 	}
 }

Essentials/src/net/ess3/commands/Commandsethome.java

@@ -1,8 +1,8 @@
 package net.ess3.commands;
 
+import static net.ess3.I18n._;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 
@@ -31,8 +31,7 @@ public class Commandsethome extends EssentialsCommand
 					{
 						throw new NotEnoughArgumentsException();
 					}
-					if ((user.getHomes().size() < ess.getRanks().getHomeLimit(user))
+					if ((user.getHomes().size() < ess.getRanks().getHomeLimit(user)) || (user.getHomes().contains(args[0].toLowerCase(Locale.ENGLISH))))
-						|| (user.getHomes().contains(args[0].toLowerCase(Locale.ENGLISH))))
 					{
 						user.getData().addHome(args[0].toLowerCase(Locale.ENGLISH), user.getPlayer().getLocation());
 						user.queueSave();
@@ -77,7 +76,10 @@ public class Commandsethome extends EssentialsCommand
 			user.getData().addHome("home", user.getPlayer().getLocation());
 			user.queueSave();
 		}
-		user.sendMessage(_("homeSet", user.getPlayer().getLocation().getWorld().getName(), user.getPlayer().getLocation().getBlockX(), user.getPlayer().getLocation().getBlockY(), user.getPlayer().getLocation().getBlockZ()));
+		user.sendMessage(
+				_(
+						"homeSet", user.getPlayer().getLocation().getWorld().getName(), user.getPlayer().getLocation().getBlockX(),
+						user.getPlayer().getLocation().getBlockY(), user.getPlayer().getLocation().getBlockZ()));
 
 	}
 }

Essentials/src/net/ess3/commands/Commandsetwarp.java

@@ -1,13 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import org.bukkit.Location;
 import net.ess3.api.IUser;
 import net.ess3.api.IWarps;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.Util;
-import org.bukkit.Location;
-
-
 
 
 public class Commandsetwarp extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandsetworth.java

@@ -1,10 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.ItemStack;
-
+import net.ess3.api.IUser;
 
 
 public class Commandsetworth extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandsocialspy.java

@@ -1,9 +1,9 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
-import org.bukkit.command.CommandSender;
 
 
 public class Commandsocialspy extends EssentialsToggleCommand
@@ -22,10 +22,12 @@ public class Commandsocialspy extends EssentialsToggleCommand
 
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
-		if (value) {
+		if (value)
+		{
 			sender.sendMessage(_("socialSpyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
 		}
-		else {
+		else
+		{
 			sender.sendMessage(_("socialSpyFailed", player.getName()));
 		}
 	}

Essentials/src/net/ess3/commands/Commandspawn.java

@@ -1,12 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.economy.Trade;
-import net.ess3.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import net.ess3.api.IUser;
+import net.ess3.economy.Trade;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandspawn extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandspawner.java

@@ -1,17 +1,17 @@
 package net.ess3.commands;
 
-import java.util.Locale;
 import static net.ess3.I18n._;
+import java.util.Locale;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.CreatureSpawner;
+import org.bukkit.entity.EntityType;
 import net.ess3.api.IUser;
 import net.ess3.bukkit.LivingEntities;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.utils.LocationUtil;
 import net.ess3.utils.Util;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.CreatureSpawner;
-import org.bukkit.entity.EntityType;
 
 
 public class Commandspawner extends EssentialsCommand

Essentials/src/net/ess3/commands/Commandspeed.java

@@ -1,11 +1,11 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandspeed extends EssentialsCommand
@@ -94,8 +94,7 @@ public class Commandspeed extends EssentialsCommand
 		{
 			isFlyMode = true;
 		}
-		else if (modeString.contains("walk") || modeString.contains("run")
+		else if (modeString.contains("walk") || modeString.contains("run") || modeString.equalsIgnoreCase("w") || modeString.equalsIgnoreCase("r"))
-				 || modeString.equalsIgnoreCase("w") || modeString.equalsIgnoreCase("r"))
 		{
 			isFlyMode = false;
 		}

Essentials/src/net/ess3/commands/Commandsudo.java

@@ -1,13 +1,12 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
-
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
 
 
 public class Commandsudo extends EssentialsCommand