diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index ff4ed6c11..26046e614 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -40,7 +40,7 @@ import fr.xephi.authme.api.API; import fr.xephi.authme.api.NewAPI; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.backup.JsonCache; +import fr.xephi.authme.cache.backup.FileCache; import fr.xephi.authme.cache.limbo.LimboCache; import fr.xephi.authme.cache.limbo.LimboPlayer; import fr.xephi.authme.commands.AdminCommand; @@ -79,36 +79,36 @@ import net.milkbowl.vault.permission.Permission; public class AuthMe extends JavaPlugin { - public DataSource database; - private Settings settings; - private Messages m; - public OtherAccounts otherAccounts; public static Server server; public static Logger authmeLogger = Logger.getLogger("AuthMe"); public static AuthMe authme; - public Permission permission; + public Management management; + public NewAPI api; private Utils utils = Utils.getInstance(); - private JsonCache playerBackup = new JsonCache(this); + public SendMailSSL mail = null; + private Settings settings; + private Messages m; + public DataManager dataManager; + public DataSource database; + private FileCache playerBackup = new FileCache(this); + public OtherAccounts otherAccounts; + public Permission permission; + public Essentials ess; + public Location essentialsSpawn; + public MultiverseCore multiverse = null; + public LookupService ls = null; public CitizensCommunicator citizens; public boolean isCitizensActive = false; - public SendMailSSL mail = null; public boolean CombatTag = false; public boolean legacyChestShop = false; public boolean BungeeCord = false; - public Essentials ess; - public NewAPI api; - public Management management; + public boolean antibotMod = false; + public boolean delayedAntiBot = true; + public ConcurrentHashMap sessions = new ConcurrentHashMap(); public ConcurrentHashMap captcha = new ConcurrentHashMap(); public ConcurrentHashMap cap = new ConcurrentHashMap(); public ConcurrentHashMap realIp = new ConcurrentHashMap(); - public MultiverseCore multiverse = null; - public Location essentialsSpawn; - public LookupService ls = null; - public boolean antibotMod = false; - public boolean delayedAntiBot = true; protected static String vgUrl = "http://monitor-1.verygames.net/api/?action=ipclean-real-ip&out=raw&ip=%IP%&port=%PORT%"; - public DataManager dataManager; - public ConcurrentHashMap sessions = new ConcurrentHashMap(); public static AuthMe getInstance() { return authme;