7 files changed, 12 insertions, 26 deletions
diff --git a/Essentials/src/net/ess3/user/CooldownException.java b/Essentials/src/net/ess3/user/CooldownException.java
index 08e163522..2cd9ac543 100644
--- a/Essentials/src/net/ess3/user/CooldownException.java
+++ b/Essentials/src/net/ess3/user/CooldownException.java
@@ -3,12 +3,10 @@ package net.ess3.user;
 
 public class CooldownException extends Exception
 {
-
 	private static final long serialVersionUID = 913632836257457319L;
 
 	public CooldownException(String timeLeft)
 	{
 		super(timeLeft);
 	}
-
 }
diff --git a/Essentials/src/net/ess3/user/IOfflinePlayer.java b/Essentials/src/net/ess3/user/IOfflinePlayer.java
index d520ce833..97a9ade5a 100644
--- a/Essentials/src/net/ess3/user/IOfflinePlayer.java
+++ b/Essentials/src/net/ess3/user/IOfflinePlayer.java
@@ -10,7 +10,6 @@ public interface IOfflinePlayer
 	String getDisplayName();
 
 	//Location getBedSpawnLocation();
-
 	void setBanned(boolean bln);
 
 	boolean hasPermission(Permission perm);
diff --git a/Essentials/src/net/ess3/user/IOfflineUser.java b/Essentials/src/net/ess3/user/IOfflineUser.java
index b5361da4f..237569825 100644
--- a/Essentials/src/net/ess3/user/IOfflineUser.java
+++ b/Essentials/src/net/ess3/user/IOfflineUser.java
@@ -5,5 +5,4 @@ import net.ess3.storage.IStorageObjectHolder;
 
 public interface IOfflineUser extends IStorageObjectHolder<UserData>//, IOfflinePlayer
 {
-
 }
diff --git a/Essentials/src/net/ess3/user/PlayerNotFoundException.java b/Essentials/src/net/ess3/user/PlayerNotFoundException.java
index 2c3c741c1..6817a7847 100644
--- a/Essentials/src/net/ess3/user/PlayerNotFoundException.java
+++ b/Essentials/src/net/ess3/user/PlayerNotFoundException.java
@@ -5,7 +5,6 @@ import static net.ess3.I18n._;
 
 public class PlayerNotFoundException extends Exception
 {
-
 	private static final long serialVersionUID = -510752839980332640L;
 
 	public PlayerNotFoundException()
diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java
index 4fce959bf..7a3aba0af 100644
--- a/Essentials/src/net/ess3/user/User.java
+++ b/Essentials/src/net/ess3/user/User.java
@@ -31,22 +31,22 @@ public class User extends UserBase implements IUser
 {
 	private CommandSender replyTo = null;
 	@Getter
-	private transient IUser teleportRequester;
+	private IUser teleportRequester;
 	@Getter
-	private transient boolean tpRequestHere;
+	private boolean tpRequestHere;
 	@Getter
-	private transient final ITeleport teleport;
+	private final ITeleport teleport;
 	@Getter
-	private transient long teleportRequestTime;
+	private long teleportRequestTime;
 	@Getter
 	@Setter
-	private transient long lastOnlineActivity;
-	private transient long lastActivity = System.currentTimeMillis();
+	private long lastOnlineActivity;
+	private long lastActivity = System.currentTimeMillis();
 	/*@Getter
 	 @Setter
 	 private boolean hidden = false;*/
 	@Getter
-	private transient boolean vanished;
+	private boolean vanished;
 	@Getter
 	@Setter
 	private boolean invSee = false;
@@ -54,7 +54,7 @@ public class User extends UserBase implements IUser
 	@Setter
 	private boolean enderSee = false;
 	private long lastThrottledAction;
-	private transient Location afkPosition;
+	private Location afkPosition;
 	private AtomicBoolean gotMailInfo = new AtomicBoolean(false);
 	private WeakReference<Player> playerCache;
 	@Getter
@@ -592,8 +592,7 @@ public class User extends UserBase implements IUser
 	{
 		return true;
 	}
-
-	private transient long teleportInvulnerabilityTimestamp = 0;
+	private long teleportInvulnerabilityTimestamp = 0;
 
 	public void enableInvulnerabilityAfterTeleport()
 	{
@@ -635,7 +634,7 @@ public class User extends UserBase implements IUser
 				}
 			}
 			ess.getVanishedPlayers().add(getName());
-			if(Permissions.VANISH_EFFECT.isAuthorized(this))
+			if (Permissions.VANISH_EFFECT.isAuthorized(this))
 			{
 				getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 1, false));
 			}
@@ -647,7 +646,7 @@ public class User extends UserBase implements IUser
 				p.showPlayer(getPlayer());
 			}
 			ess.getVanishedPlayers().remove(getName());
-			if(Permissions.VANISH_EFFECT.isAuthorized(this))
+			if (Permissions.VANISH_EFFECT.isAuthorized(this))
 			{
 				getPlayer().removePotionEffect(PotionEffectType.INVISIBILITY);
 			}
diff --git a/Essentials/src/net/ess3/user/UserData.java b/Essentials/src/net/ess3/user/UserData.java
index b9d684930..9b63fab2f 100644
--- a/Essentials/src/net/ess3/user/UserData.java
+++ b/Essentials/src/net/ess3/user/UserData.java
@@ -6,6 +6,7 @@ import net.ess3.storage.*;
 import org.bukkit.Location;
 import org.bukkit.Material;
 
+
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class UserData implements StorageObject
@@ -14,8 +15,6 @@ public class UserData implements StorageObject
 	{
 		JAIL, MUTE, LASTHEAL, LASTTELEPORT, LOGIN, LOGOUT, KIT, COMMAND
 	}
-
-
 	private String nickname;
 	private Double money;
 	@MapValueType(StoredLocation.class)
@@ -27,7 +26,6 @@ public class UserData implements StorageObject
 	{
 		return homes == null ? Collections.<String, StoredLocation>emptyMap() : Collections.unmodifiableMap(homes);
 	}
-
 	@ListType(Material.class)
 	@Getter(AccessLevel.NONE)
 	@Setter(AccessLevel.NONE)
@@ -37,7 +35,6 @@ public class UserData implements StorageObject
 	{
 		return unlimited == null ? Collections.<Material>emptySet() : Collections.unmodifiableSet(unlimited);
 	}
-
 	@MapValueType(List.class)
 	@MapKeyType(Material.class)
 	@Getter(AccessLevel.NONE)
@@ -48,7 +45,6 @@ public class UserData implements StorageObject
 	{
 		return powerTools == null ? Collections.<Material, List<String>>emptyMap() : Collections.unmodifiableMap(powerTools);
 	}
-
 	private StoredLocation lastLocation;
 	@MapKeyType(String.class)
 	@MapValueType(Long.class)
@@ -60,7 +56,6 @@ public class UserData implements StorageObject
 	{
 		return timestamps == null ? Collections.<String, Long>emptyMap() : Collections.unmodifiableMap(timestamps);
 	}
-
 	private String jail;
 	@ListType
 	@Getter(AccessLevel.NONE)
@@ -71,7 +66,6 @@ public class UserData implements StorageObject
 	{
 		return mails == null ? Collections.<String>emptyList() : Collections.unmodifiableList(mails);
 	}
-
 	private Inventory inventory;
 	private boolean teleportEnabled;
 	@ListType
@@ -83,7 +77,6 @@ public class UserData implements StorageObject
 	{
 		return ignore == null ? Collections.<String>emptySet() : Collections.unmodifiableSet(ignore);
 	}
-
 	private boolean godmode;
 	private boolean muted;
 	private boolean jailed;
diff --git a/Essentials/src/net/ess3/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java
index c83047f0c..9df31e543 100644
--- a/Essentials/src/net/ess3/user/UserMap.java
+++ b/Essentials/src/net/ess3/user/UserMap.java
@@ -141,7 +141,6 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap
 	{
 		return matchUsers(name, false, false, requester);
 	}
-
 	private final Pattern comma = Pattern.compile(",");
 
 	public Set<IUser> matchUsers(final String name, final boolean includeHidden, final boolean includeOffline, final Player requester)