Stuff from the common floobits workspace

Author:    AuthMe-Team <AuthMeTeam@123NoEmail.com>

src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java

@@ -1,19 +1,18 @@
 package fr.xephi.authme.cache.limbo;
 
-import java.util.concurrent.ConcurrentHashMap;
-
-import fr.xephi.authme.permission.PermissionsManager;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.backup.DataFileCache;
 import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.events.ResetInventoryEvent;
+import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.settings.Settings;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  */
@@ -21,11 +20,12 @@ public class LimboCache {
 
     private volatile static LimboCache singleton;
     public ConcurrentHashMap<String, LimboPlayer> cache;
-    private JsonCache playerData;
     public AuthMe plugin;
+    private JsonCache playerData;
 
     /**
      * Constructor for LimboCache.
+     *
      * @param plugin AuthMe
      */
     private LimboCache(AuthMe plugin) {
@@ -34,6 +34,18 @@ public class LimboCache {
         this.playerData = new JsonCache();
     }
 
+    /**
+     * Method getInstance.
+     *
+     * @return LimboCache
+     */
+    public static LimboCache getInstance() {
+        if (singleton == null) {
+            singleton = new LimboCache(AuthMe.getInstance());
+        }
+        return singleton;
+    }
+
     /**
      * Add a limbo player.
      *
@@ -49,7 +61,7 @@ public class LimboCache {
 
         // Get the permissions manager, and make sure it's valid
         PermissionsManager permsMan = this.plugin.getPermissionsManager();
-        if(permsMan == null)
+        if (permsMan == null)
             ConsoleLogger.showError("Unable to access permissions manager!");
         assert permsMan != null;
 
@@ -65,7 +77,7 @@ public class LimboCache {
             flying = player.isFlying();
 
             // Check whether groups are supported
-            if(permsMan.hasGroupSupport())
+            if (permsMan.hasGroupSupport())
                 playerGroup = permsMan.getPrimaryGroup(player);
         }
 
@@ -91,8 +103,9 @@ public class LimboCache {
 
     /**
      * Method addLimboPlayer.
+     *
      * @param player Player
-     * @param group String
+     * @param group  String
      */
     public void addLimboPlayer(Player player, String group) {
         cache.put(player.getName().toLowerCase(), new LimboPlayer(player.getName().toLowerCase(), group));
@@ -100,6 +113,7 @@ public class LimboCache {
 
     /**
      * Method deleteLimboPlayer.
+     *
      * @param name String
      */
     public void deleteLimboPlayer(String name) {
@@ -108,35 +122,27 @@ public class LimboCache {
 
     /**
      * Method getLimboPlayer.
+     *
      * @param name String
-    
-     * @return LimboPlayer */
+     * @return LimboPlayer
+     */
     public LimboPlayer getLimboPlayer(String name) {
         return cache.get(name);
     }
 
     /**
      * Method hasLimboPlayer.
+     *
      * @param name String
-    
-     * @return boolean */
+     * @return boolean
+     */
     public boolean hasLimboPlayer(String name) {
         return cache.containsKey(name);
     }
 
-    /**
-     * Method getInstance.
-    
-     * @return LimboCache */
-    public static LimboCache getInstance() {
-        if (singleton == null) {
-            singleton = new LimboCache(AuthMe.getInstance());
-        }
-        return singleton;
-    }
-
     /**
      * Method updateLimboPlayer.
+     *
      * @param player Player
      */
     public void updateLimboPlayer(Player player) {

src/main/java/fr/xephi/authme/cache/limbo/LimboPlayer.java

@@ -19,15 +19,16 @@ public class LimboPlayer {
 
     /**
      * Constructor for LimboPlayer.
-     * @param name String
-     * @param loc Location
+     *
+     * @param name     String
+     * @param loc      Location
      * @param gameMode GameMode
      * @param operator boolean
-     * @param group String
-     * @param flying boolean
+     * @param group    String
+     * @param flying   boolean
      */
     public LimboPlayer(String name, Location loc, GameMode gameMode,
-            boolean operator, String group, boolean flying) {
+                       boolean operator, String group, boolean flying) {
         this.name = name;
         this.loc = loc;
         this.gameMode = gameMode;
@@ -38,7 +39,8 @@ public class LimboPlayer {
 
     /**
      * Constructor for LimboPlayer.
-     * @param name String
+     *
+     * @param name  String
      * @param group String
      */
     public LimboPlayer(String name, String group) {
@@ -48,46 +50,61 @@ public class LimboPlayer {
 
     /**
      * Method getName.
-    
-     * @return String */
+     *
+     * @return String
+     */
     public String getName() {
         return name;
     }
 
     /**
      * Method getLoc.
-    
-     * @return Location */
+     *
+     * @return Location
+     */
     public Location getLoc() {
         return loc;
     }
 
     /**
      * Method getGameMode.
-    
-     * @return GameMode */
+     *
+     * @return GameMode
+     */
     public GameMode getGameMode() {
         return gameMode;
     }
 
     /**
      * Method getOperator.
-    
-     * @return boolean */
+     *
+     * @return boolean
+     */
     public boolean getOperator() {
         return operator;
     }
 
     /**
      * Method getGroup.
-    
-     * @return String */
+     *
+     * @return String
+     */
     public String getGroup() {
         return group;
     }
 
+    /**
+     * Method getTimeoutTaskId.
+     *
+     * @return BukkitTask
+     */
+    public BukkitTask getTimeoutTaskId() {
+        return timeoutTaskId;
+    }
+
     /**
      * Method setTimeoutTaskId.
+     *
      * @param i BukkitTask
      */
     public void setTimeoutTaskId(BukkitTask i) {
@@ -97,15 +114,17 @@ public class LimboPlayer {
     }
 
     /**
-     * Method getTimeoutTaskId.
-    
-     * @return BukkitTask */
-    public BukkitTask getTimeoutTaskId() {
-        return timeoutTaskId;
+     * Method getMessageTaskId.
+     *
+     * @return BukkitTask
+     */
+    public BukkitTask getMessageTaskId() {
+        return messageTaskId;
     }
 
     /**
      * Method setMessageTaskId.
+     *
      * @param messageTaskId BukkitTask
      */
     public void setMessageTaskId(BukkitTask messageTaskId) {
@@ -114,18 +133,11 @@ public class LimboPlayer {
         this.messageTaskId = messageTaskId;
     }
 
-    /**
-     * Method getMessageTaskId.
-    
-     * @return BukkitTask */
-    public BukkitTask getMessageTaskId() {
-        return messageTaskId;
-    }
-
     /**
      * Method isFlying.
-    
-     * @return boolean */
+     *
+     * @return boolean
+     */
     public boolean isFlying() {
         return flying;
     }