Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-09 04:02:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
This commit is contained in:
DNx5 2015-09-13 22:09:12 +07:00
commit cb59f44b9b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -40,7 +40,7 @@ import fr.xephi.authme.api.API;
import fr.xephi.authme.api.NewAPI; import fr.xephi.authme.api.NewAPI;
import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache; 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.LimboCache;
import fr.xephi.authme.cache.limbo.LimboPlayer; import fr.xephi.authme.cache.limbo.LimboPlayer;
import fr.xephi.authme.commands.AdminCommand; import fr.xephi.authme.commands.AdminCommand;
@ -79,36 +79,36 @@ import net.milkbowl.vault.permission.Permission;
public class AuthMe extends JavaPlugin { public class AuthMe extends JavaPlugin {
public DataSource database;
private Settings settings;
private Messages m;
public OtherAccounts otherAccounts;
public static Server server; public static Server server;
public static Logger authmeLogger = Logger.getLogger("AuthMe"); public static Logger authmeLogger = Logger.getLogger("AuthMe");
public static AuthMe authme; public static AuthMe authme;
public Permission permission; public Management management;
public NewAPI api;
private Utils utils = Utils.getInstance(); 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 CitizensCommunicator citizens;
public boolean isCitizensActive = false; public boolean isCitizensActive = false;
public SendMailSSL mail = null;
public boolean CombatTag = false; public boolean CombatTag = false;
public boolean legacyChestShop = false; public boolean legacyChestShop = false;
public boolean BungeeCord = false; public boolean BungeeCord = false;
public Essentials ess; public boolean antibotMod = false;
public NewAPI api; public boolean delayedAntiBot = true;
public Management management; public ConcurrentHashMap<String, BukkitTask> sessions = new ConcurrentHashMap<String, BukkitTask>();
public ConcurrentHashMap<String, Integer> captcha = new ConcurrentHashMap<String, Integer>(); public ConcurrentHashMap<String, Integer> captcha = new ConcurrentHashMap<String, Integer>();
public ConcurrentHashMap<String, String> cap = new ConcurrentHashMap<String, String>(); public ConcurrentHashMap<String, String> cap = new ConcurrentHashMap<String, String>();
public ConcurrentHashMap<String, String> realIp = new ConcurrentHashMap<String, String>(); public ConcurrentHashMap<String, String> realIp = new ConcurrentHashMap<String, String>();
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%"; 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<String, BukkitTask> sessions = new ConcurrentHashMap<String, BukkitTask>();
public static AuthMe getInstance() { public static AuthMe getInstance() {
return authme; return authme;