From 36632bbb58b3b32f0fb15d9796dfb3c5a1c9ef34 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Thu, 9 Jul 2015 21:02:37 +0200 Subject: [PATCH 01/14] Fix the instance of database --- src/main/java/fr/xephi/authme/AuthMe.java | 26 +++++----- .../java/fr/xephi/authme/DataManager.java | 8 +-- src/main/java/fr/xephi/authme/api/API.java | 14 ++--- .../xephi/authme/commands/AdminCommand.java | 49 +++++++++--------- .../commands/ChangePasswordCommand.java | 9 ++-- .../authme/commands/ConverterCommand.java | 15 +++--- .../xephi/authme/commands/EmailCommand.java | 25 ++++----- .../xephi/authme/commands/LogoutCommand.java | 10 +--- .../authme/commands/UnregisterCommand.java | 7 +-- .../authme/converter/CrazyLoginConverter.java | 6 +-- .../authme/converter/RakamakConverter.java | 5 +- .../fr/xephi/authme/converter/SqlToFlat.java | 4 +- .../authme/converter/vAuthConverter.java | 7 ++- .../authme/converter/vAuthFileReader.java | 5 +- .../authme/converter/xAuthConverter.java | 8 +-- .../xephi/authme/converter/xAuthToFlat.java | 5 +- .../authme/listener/AuthMeBlockListener.java | 10 ++-- .../listener/AuthMeChestShopListener.java | 7 +-- .../authme/listener/AuthMeEntityListener.java | 19 +++---- .../authme/listener/AuthMePlayerListener.java | 51 +++++++++---------- .../fr/xephi/authme/process/Management.java | 15 +++--- 21 files changed, 126 insertions(+), 179 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index f11b5105e..ec7cea77d 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -208,13 +208,13 @@ public class AuthMe extends JavaPlugin { setupDatabase(); - dataManager = new DataManager(this, database); + dataManager = new DataManager(this); // Setup API - api = new API(this, database); + api = new API(this); // Setup Management - management = new Management(database, this); + management = new Management(this); PluginManager pm = getServer().getPluginManager(); if (Settings.bungee) { @@ -222,25 +222,25 @@ public class AuthMe extends JavaPlugin { Bukkit.getMessenger().registerIncomingPluginChannel(this, "BungeeCord", new BungeeCordMessage(this)); } - pm.registerEvents(new AuthMePlayerListener(this, database), this); - pm.registerEvents(new AuthMeBlockListener(database, this), this); - pm.registerEvents(new AuthMeEntityListener(database, this), this); + pm.registerEvents(new AuthMePlayerListener(this), this); + pm.registerEvents(new AuthMeBlockListener(this), this); + pm.registerEvents(new AuthMeEntityListener(this), this); pm.registerEvents(new AuthMeServerListener(this), this); if (ChestShop != 0) { - pm.registerEvents(new AuthMeChestShopListener(database, this), this); + pm.registerEvents(new AuthMeChestShopListener(this), this); ConsoleLogger.info("Successfully hook with ChestShop!"); } - this.getCommand("authme").setExecutor(new AdminCommand(this, database)); + this.getCommand("authme").setExecutor(new AdminCommand(this)); this.getCommand("register").setExecutor(new RegisterCommand(this)); this.getCommand("login").setExecutor(new LoginCommand(this)); - this.getCommand("changepassword").setExecutor(new ChangePasswordCommand(database, this)); - this.getCommand("logout").setExecutor(new LogoutCommand(this, database)); - this.getCommand("unregister").setExecutor(new UnregisterCommand(this, database)); + this.getCommand("changepassword").setExecutor(new ChangePasswordCommand(this)); + this.getCommand("logout").setExecutor(new LogoutCommand(this)); + this.getCommand("unregister").setExecutor(new UnregisterCommand(this)); this.getCommand("passpartu").setExecutor(new PasspartuCommand(this)); - this.getCommand("email").setExecutor(new EmailCommand(this, database)); + this.getCommand("email").setExecutor(new EmailCommand(this)); this.getCommand("captcha").setExecutor(new CaptchaCommand(this)); - this.getCommand("converter").setExecutor(new ConverterCommand(this, database)); + this.getCommand("converter").setExecutor(new ConverterCommand(this)); if (!Settings.isForceSingleSessionEnabled) { ConsoleLogger.showError("BECAREFUL !!! By disabling ForceSingleSession, your server protection is set to LOW"); diff --git a/src/main/java/fr/xephi/authme/DataManager.java b/src/main/java/fr/xephi/authme/DataManager.java index a1de30f31..3804999ad 100644 --- a/src/main/java/fr/xephi/authme/DataManager.java +++ b/src/main/java/fr/xephi/authme/DataManager.java @@ -8,23 +8,19 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import net.milkbowl.vault.permission.Permission; - import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.settings.Settings; +import net.milkbowl.vault.permission.Permission; public class DataManager { public AuthMe plugin; - public DataSource database; - public DataManager(AuthMe plugin, DataSource database) { + public DataManager(AuthMe plugin) { this.plugin = plugin; - this.database = database; } public void run() { diff --git a/src/main/java/fr/xephi/authme/api/API.java b/src/main/java/fr/xephi/authme/api/API.java index c60de1210..d718a0adb 100644 --- a/src/main/java/fr/xephi/authme/api/API.java +++ b/src/main/java/fr/xephi/authme/api/API.java @@ -13,7 +13,6 @@ import fr.xephi.authme.AuthMe; import fr.xephi.authme.Utils; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.plugin.manager.CombatTagComunicator; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.settings.Settings; @@ -23,16 +22,13 @@ public class API { public static final String newline = System.getProperty("line.separator"); public static API singleton; public AuthMe plugin; - public DataSource database; - public API(AuthMe plugin, DataSource database) { + public API(AuthMe plugin) { this.plugin = plugin; - this.database = database; } public API(Server serv) { this.plugin = (AuthMe) serv.getPluginManager().getPlugin("AuthMe"); - this.database = this.plugin.database; } /** @@ -50,7 +46,7 @@ public class API { return null; } AuthMe authme = (AuthMe) p; - singleton = (new API(authme, authme.database)); + singleton = (new API(authme)); return singleton; } @@ -119,7 +115,7 @@ public class API { */ public boolean isRegistered(String playerName) { String player = playerName.toLowerCase(); - return database.isAuthAvailable(player); + return plugin.database.isAuthAvailable(player); } /** @@ -131,7 +127,7 @@ public class API { if (!isRegistered(playerName)) return false; String player = playerName.toLowerCase(); - PlayerAuth auth = database.getAuth(player); + PlayerAuth auth = plugin.database.getAuth(player); try { return PasswordSecurity.comparePasswordWithHash(passwordToCheck, auth.getHash(), playerName); } catch (NoSuchAlgorithmException e) { @@ -154,7 +150,7 @@ public class API { return false; } PlayerAuth auth = new PlayerAuth(name, hash, "198.18.0.1", 0, "your@email.com"); - if (!database.saveAuth(auth)) { + if (!plugin.database.saveAuth(auth)) { return false; } return true; diff --git a/src/main/java/fr/xephi/authme/commands/AdminCommand.java b/src/main/java/fr/xephi/authme/commands/AdminCommand.java index 947df69a2..fffc0aca1 100644 --- a/src/main/java/fr/xephi/authme/commands/AdminCommand.java +++ b/src/main/java/fr/xephi/authme/commands/AdminCommand.java @@ -33,7 +33,6 @@ import fr.xephi.authme.Utils.groupType; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.cache.limbo.LimboCache; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.SpawnTeleportEvent; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.settings.Messages; @@ -46,10 +45,8 @@ public class AdminCommand implements CommandExecutor { public AuthMe plugin; private Messages m = Messages.getInstance(); - public DataSource database; - public AdminCommand(AuthMe plugin, DataSource database) { - this.database = database; + public AdminCommand(AuthMe plugin) { this.plugin = plugin; } @@ -107,7 +104,7 @@ public class AdminCommand implements CommandExecutor { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DATE, -(Integer.parseInt(args[1]))); long until = calendar.getTimeInMillis(); - List purged = database.autoPurgeDatabase(until); + List purged = plugin.database.autoPurgeDatabase(until); sender.sendMessage("Deleted " + purged.size() + " user accounts"); if (Settings.purgeEssentialsFile && plugin.ess != null) plugin.dataManager.purgeEssentials(purged); @@ -161,8 +158,8 @@ public class AdminCommand implements CommandExecutor { return true; } try { - if (database.getAuth(args[1].toLowerCase()) != null) { - PlayerAuth player = database.getAuth(args[1].toLowerCase()); + if (plugin.database.getAuth(args[1].toLowerCase()) != null) { + PlayerAuth player = plugin.database.getAuth(args[1].toLowerCase()); long lastLogin = player.getLastLogin(); Date d = new Date(lastLogin); final long diff = System.currentTimeMillis() - lastLogin; @@ -195,13 +192,13 @@ public class AdminCommand implements CommandExecutor { PlayerAuth pAuth = null; String message = "[AuthMe] "; try { - pAuth = database.getAuth(arguments[1].toLowerCase()); + pAuth = plugin.database.getAuth(arguments[1].toLowerCase()); } catch (NullPointerException npe) { fSender.sendMessage("[AuthMe] This player is unknown"); return; } if (pAuth != null) { - List accountList = database.getAllAuthsByName(pAuth); + List accountList = plugin.database.getAllAuthsByName(pAuth); if (accountList.isEmpty() || accountList == null) { fSender.sendMessage("[AuthMe] This player is unknown"); return; @@ -238,7 +235,7 @@ public class AdminCommand implements CommandExecutor { public void run() { String message = "[AuthMe] "; if (arguments[1] != null) { - List accountList = database.getAllAuthsByIp(arguments[1]); + List accountList = plugin.database.getAllAuthsByIp(arguments[1]); if (accountList.isEmpty() || accountList == null) { fSender.sendMessage("[AuthMe] Please put a valid IP"); return; @@ -275,7 +272,7 @@ public class AdminCommand implements CommandExecutor { } try { String name = args[1].toLowerCase(); - if (database.isAuthAvailable(name)) { + if (plugin.database.isAuthAvailable(name)) { m.send(sender, "user_regged"); return true; } @@ -284,7 +281,7 @@ public class AdminCommand implements CommandExecutor { if (PasswordSecurity.userSalt.containsKey(name) && PasswordSecurity.userSalt.get(name) != null) auth.setSalt(PasswordSecurity.userSalt.get(name)); else auth.setSalt(""); - if (!database.saveAuth(auth)) { + if (!plugin.database.saveAuth(auth)) { m.send(sender, "error"); return true; } @@ -301,7 +298,7 @@ public class AdminCommand implements CommandExecutor { return true; } String playername = args[1].toLowerCase(); - PlayerAuth getAuth = database.getAuth(playername); + PlayerAuth getAuth = plugin.database.getAuth(playername); if (getAuth == null) { m.send(sender, "unknown_user"); return true; @@ -314,13 +311,13 @@ public class AdminCommand implements CommandExecutor { return true; } String playername = args[1].toLowerCase(); - PlayerAuth getAuth = database.getAuth(playername); + PlayerAuth getAuth = plugin.database.getAuth(playername); if (getAuth == null) { m.send(sender, "unknown_user"); return true; } getAuth.setEmail(args[2]); - if (!database.updateEmail(getAuth)) { + if (!plugin.database.updateEmail(getAuth)) { m.send(sender, "error"); return true; } @@ -358,7 +355,7 @@ public class AdminCommand implements CommandExecutor { for (OfflinePlayer off : plugin.getServer().getBannedPlayers()) { bannedPlayers.add(off.getName().toLowerCase()); } - database.purgeBanned(bannedPlayers); + plugin.database.purgeBanned(bannedPlayers); if (Settings.purgeEssentialsFile && plugin.ess != null) plugin.dataManager.purgeEssentials(bannedPlayers); if (Settings.purgePlayerDat) @@ -406,8 +403,8 @@ public class AdminCommand implements CommandExecutor { PlayerAuth auth = null; if (PlayerCache.getInstance().isAuthenticated(name)) { auth = PlayerCache.getInstance().getAuth(name); - } else if (database.isAuthAvailable(name)) { - auth = database.getAuth(name); + } else if (plugin.database.isAuthAvailable(name)) { + auth = plugin.database.getAuth(name); } if (auth == null) { m.send(sender, "unknown_user"); @@ -416,9 +413,9 @@ public class AdminCommand implements CommandExecutor { auth.setHash(hash); if (PasswordSecurity.userSalt.containsKey(name)) { auth.setSalt(PasswordSecurity.userSalt.get(name)); - database.updateSalt(auth); + plugin.database.updateSalt(auth); } - if (!database.updatePassword(auth)) { + if (!plugin.database.updatePassword(auth)) { m.send(sender, "error"); return true; } @@ -435,11 +432,11 @@ public class AdminCommand implements CommandExecutor { return true; } String name = args[1].toLowerCase(); - if (!database.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { m.send(sender, "user_unknown"); return true; } - if (!database.removeAuth(name)) { + if (!plugin.database.removeAuth(name)) { m.send(sender, "error"); return true; } @@ -484,7 +481,7 @@ public class AdminCommand implements CommandExecutor { } try { String name = args[1].toLowerCase(); - PlayerAuth auth = database.getAuth(name); + PlayerAuth auth = plugin.database.getAuth(name); if (auth == null) { sender.sendMessage("The player " + name + " is not registered "); return true; @@ -493,7 +490,7 @@ public class AdminCommand implements CommandExecutor { auth.setQuitLocY(0); auth.setQuitLocZ(0); auth.setWorld("world"); - database.updateQuitLoc(auth); + plugin.database.updateQuitLoc(auth); sender.sendMessage(name + " 's last pos location is now reset"); } catch (Exception e) { ConsoleLogger.showError("An error occured while trying to reset location or player do not exist, please see below: "); @@ -539,7 +536,7 @@ public class AdminCommand implements CommandExecutor { sender.sendMessage("Usage : /authme resetPosition "); return true; } - PlayerAuth auth = database.getAuth(args[1]); + PlayerAuth auth = plugin.database.getAuth(args[1]); if (auth == null) { m.send(sender, "unknown_user"); return true; @@ -548,7 +545,7 @@ public class AdminCommand implements CommandExecutor { auth.setQuitLocY(0D); auth.setQuitLocZ(0D); auth.setWorld("world"); - database.updateQuitLoc(auth); + plugin.database.updateQuitLoc(auth); sender.sendMessage("[AuthMe] Successfully reset position for " + auth.getNickname()); return true; } else if (args[0].equalsIgnoreCase("forcelogin")) { diff --git a/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java index c6c5fb5c7..aa905658f 100644 --- a/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java +++ b/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java @@ -11,7 +11,6 @@ import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Settings; @@ -19,11 +18,9 @@ import fr.xephi.authme.settings.Settings; public class ChangePasswordCommand implements CommandExecutor { private Messages m = Messages.getInstance(); - private DataSource database; public AuthMe plugin; - public ChangePasswordCommand(DataSource database, AuthMe plugin) { - this.database = database; + public ChangePasswordCommand(AuthMe plugin) { this.plugin = plugin; } @@ -79,11 +76,11 @@ public class ChangePasswordCommand implements CommandExecutor { if (PasswordSecurity.userSalt.containsKey(name) && PasswordSecurity.userSalt.get(name) != null) auth.setSalt(PasswordSecurity.userSalt.get(name)); else auth.setSalt(""); - if (!database.updatePassword(auth)) { + if (!plugin.database.updatePassword(auth)) { m.send(player, "error"); return true; } - database.updateSalt(auth); + plugin.database.updateSalt(auth); PlayerCache.getInstance().updatePlayer(auth); m.send(player, "pwd_changed"); ConsoleLogger.info(player.getName() + " changed his password"); diff --git a/src/main/java/fr/xephi/authme/commands/ConverterCommand.java b/src/main/java/fr/xephi/authme/commands/ConverterCommand.java index a5c3a1155..3da052a04 100644 --- a/src/main/java/fr/xephi/authme/commands/ConverterCommand.java +++ b/src/main/java/fr/xephi/authme/commands/ConverterCommand.java @@ -16,18 +16,15 @@ import fr.xephi.authme.converter.RoyalAuthConverter; import fr.xephi.authme.converter.SqlToFlat; import fr.xephi.authme.converter.vAuthConverter; import fr.xephi.authme.converter.xAuthConverter; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.settings.Messages; public class ConverterCommand implements CommandExecutor { private AuthMe plugin; private Messages m = Messages.getInstance(); - private DataSource database; - public ConverterCommand(AuthMe plugin, DataSource database) { + public ConverterCommand(AuthMe plugin) { this.plugin = plugin; - this.database = database; } @Override @@ -61,22 +58,22 @@ public class ConverterCommand implements CommandExecutor { converter = new FlatToSqlite(sender); break; case xauth: - converter = new xAuthConverter(plugin, database, sender); + converter = new xAuthConverter(plugin, sender); break; case crazylogin: - converter = new CrazyLoginConverter(plugin, database, sender); + converter = new CrazyLoginConverter(plugin, sender); break; case rakamak: - converter = new RakamakConverter(plugin, database, sender); + converter = new RakamakConverter(plugin, sender); break; case royalauth: converter = new RoyalAuthConverter(plugin); break; case vauth: - converter = new vAuthConverter(plugin, database, sender); + converter = new vAuthConverter(plugin, sender); break; case sqltoflat: - converter = new SqlToFlat(plugin, database, sender); + converter = new SqlToFlat(plugin, sender); break; default: break; diff --git a/src/main/java/fr/xephi/authme/commands/EmailCommand.java b/src/main/java/fr/xephi/authme/commands/EmailCommand.java index ab32be6de..a5ada2c0d 100644 --- a/src/main/java/fr/xephi/authme/commands/EmailCommand.java +++ b/src/main/java/fr/xephi/authme/commands/EmailCommand.java @@ -11,7 +11,6 @@ import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.security.RandomString; import fr.xephi.authme.settings.Messages; @@ -24,12 +23,10 @@ import fr.xephi.authme.settings.Settings; public class EmailCommand implements CommandExecutor { public AuthMe plugin; - private DataSource data; private Messages m = Messages.getInstance(); - public EmailCommand(AuthMe plugin, DataSource data) { + public EmailCommand(AuthMe plugin) { this.plugin = plugin; - this.data = data; } @Override @@ -60,7 +57,7 @@ public class EmailCommand implements CommandExecutor { return true; } if (Settings.getmaxRegPerEmail > 0) { - if (!plugin.authmePermissible(sender, "authme.allow2accounts") && data.getAllAuthsByEmail(args[1]).size() >= Settings.getmaxRegPerEmail) { + if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(args[1]).size() >= Settings.getmaxRegPerEmail) { m.send(player, "max_reg"); return true; } @@ -76,7 +73,7 @@ public class EmailCommand implements CommandExecutor { return true; } auth.setEmail(args[1]); - if (!data.updateEmail(auth)) { + if (!plugin.database.updateEmail(auth)) { m.send(player, "error"); return true; } @@ -86,7 +83,7 @@ public class EmailCommand implements CommandExecutor { } else if (PlayerCache.getInstance().isAuthenticated(name)) { m.send(player, "email_confirm"); } else { - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { m.send(player, "login_msg"); } else { m.send(player, "reg_email_msg"); @@ -98,7 +95,7 @@ public class EmailCommand implements CommandExecutor { return true; } if (Settings.getmaxRegPerEmail > 0) { - if (!plugin.authmePermissible(sender, "authme.allow2accounts") && data.getAllAuthsByEmail(args[2]).size() >= Settings.getmaxRegPerEmail) { + if (!plugin.authmePermissible(sender, "authme.allow2accounts") && plugin.database.getAllAuthsByEmail(args[2]).size() >= Settings.getmaxRegPerEmail) { m.send(player, "max_reg"); return true; } @@ -118,7 +115,7 @@ public class EmailCommand implements CommandExecutor { return true; } auth.setEmail(args[2]); - if (!data.updateEmail(auth)) { + if (!plugin.database.updateEmail(auth)) { m.send(player, "error"); return true; } @@ -128,7 +125,7 @@ public class EmailCommand implements CommandExecutor { } else if (PlayerCache.getInstance().isAuthenticated(name)) { m.send(player, "email_confirm"); } else { - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { m.send(player, "login_msg"); } else { m.send(player, "reg_email_msg"); @@ -144,7 +141,7 @@ public class EmailCommand implements CommandExecutor { m.send(player, "error"); return true; } - if (data.isAuthAvailable(name)) { + if (plugin.database.isAuthAvailable(name)) { if (PlayerCache.getInstance().isAuthenticated(name)) { m.send(player, "logged_in"); return true; @@ -156,8 +153,8 @@ public class EmailCommand implements CommandExecutor { PlayerAuth auth = null; if (PlayerCache.getInstance().isAuthenticated(name)) { auth = PlayerCache.getInstance().getAuth(name); - } else if (data.isAuthAvailable(name)) { - auth = data.getAuth(name); + } else if (plugin.database.isAuthAvailable(name)) { + auth = plugin.database.getAuth(name); } else { m.send(player, "unknown_user"); return true; @@ -172,7 +169,7 @@ public class EmailCommand implements CommandExecutor { return true; } auth.setHash(hashnew); - data.updatePassword(auth); + plugin.database.updatePassword(auth); plugin.mail.main(auth, thePass); m.send(player, "email_send"); } catch (NoSuchAlgorithmException ex) { diff --git a/src/main/java/fr/xephi/authme/commands/LogoutCommand.java b/src/main/java/fr/xephi/authme/commands/LogoutCommand.java index cb05b4de0..4c21f7f66 100644 --- a/src/main/java/fr/xephi/authme/commands/LogoutCommand.java +++ b/src/main/java/fr/xephi/authme/commands/LogoutCommand.java @@ -6,23 +6,15 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.Utils; -import fr.xephi.authme.cache.backup.FileCache; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.settings.Messages; public class LogoutCommand implements CommandExecutor { private Messages m = Messages.getInstance(); private AuthMe plugin; - private DataSource database; - private Utils utils = Utils.getInstance(); - private FileCache playerBackup; - public LogoutCommand(AuthMe plugin, DataSource database) { + public LogoutCommand(AuthMe plugin) { this.plugin = plugin; - this.database = database; - this.playerBackup = new FileCache(plugin); } @Override diff --git a/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java b/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java index 0b8bf9435..dd1a94e94 100644 --- a/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java +++ b/src/main/java/fr/xephi/authme/commands/UnregisterCommand.java @@ -20,7 +20,6 @@ import fr.xephi.authme.Utils.groupType; import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.cache.backup.FileCache; import fr.xephi.authme.cache.limbo.LimboCache; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.events.SpawnTeleportEvent; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.settings.Messages; @@ -32,12 +31,10 @@ public class UnregisterCommand implements CommandExecutor { private Messages m = Messages.getInstance(); public AuthMe plugin; - private DataSource database; private FileCache playerCache; - public UnregisterCommand(AuthMe plugin, DataSource database) { + public UnregisterCommand(AuthMe plugin) { this.plugin = plugin; - this.database = database; this.playerCache = new FileCache(plugin); } @@ -67,7 +64,7 @@ public class UnregisterCommand implements CommandExecutor { } try { if (PasswordSecurity.comparePasswordWithHash(args[0], PlayerCache.getInstance().getAuth(name).getHash(), player.getName())) { - if (!database.removeAuth(name)) { + if (!plugin.database.removeAuth(name)) { player.sendMessage("error"); return true; } diff --git a/src/main/java/fr/xephi/authme/converter/CrazyLoginConverter.java b/src/main/java/fr/xephi/authme/converter/CrazyLoginConverter.java index fdd8e34f0..d4577bcd7 100644 --- a/src/main/java/fr/xephi/authme/converter/CrazyLoginConverter.java +++ b/src/main/java/fr/xephi/authme/converter/CrazyLoginConverter.java @@ -5,6 +5,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; + import org.bukkit.command.CommandSender; import fr.xephi.authme.AuthMe; @@ -23,10 +24,9 @@ public class CrazyLoginConverter implements Converter { public DataSource database; public CommandSender sender; - public CrazyLoginConverter(AuthMe instance, DataSource database, - CommandSender sender) { + public CrazyLoginConverter(AuthMe instance, CommandSender sender) { this.instance = instance; - this.database = database; + this.database = instance.database; this.sender = sender; } diff --git a/src/main/java/fr/xephi/authme/converter/RakamakConverter.java b/src/main/java/fr/xephi/authme/converter/RakamakConverter.java index 2d0c5a51e..712207673 100644 --- a/src/main/java/fr/xephi/authme/converter/RakamakConverter.java +++ b/src/main/java/fr/xephi/authme/converter/RakamakConverter.java @@ -29,10 +29,9 @@ public class RakamakConverter implements Converter { public DataSource database; public CommandSender sender; - public RakamakConverter(AuthMe instance, DataSource database, - CommandSender sender) { + public RakamakConverter(AuthMe instance, CommandSender sender) { this.instance = instance; - this.database = database; + this.database = instance.database; this.sender = sender; } diff --git a/src/main/java/fr/xephi/authme/converter/SqlToFlat.java b/src/main/java/fr/xephi/authme/converter/SqlToFlat.java index 0194e412f..4dccbd439 100644 --- a/src/main/java/fr/xephi/authme/converter/SqlToFlat.java +++ b/src/main/java/fr/xephi/authme/converter/SqlToFlat.java @@ -17,9 +17,9 @@ public class SqlToFlat implements Converter { public DataSource database; public CommandSender sender; - public SqlToFlat(AuthMe plugin, DataSource database, CommandSender sender) { + public SqlToFlat(AuthMe plugin, CommandSender sender) { this.plugin = plugin; - this.database = database; + this.database = plugin.database; this.sender = sender; } diff --git a/src/main/java/fr/xephi/authme/converter/vAuthConverter.java b/src/main/java/fr/xephi/authme/converter/vAuthConverter.java index bc9bc8de3..1939c6c1a 100644 --- a/src/main/java/fr/xephi/authme/converter/vAuthConverter.java +++ b/src/main/java/fr/xephi/authme/converter/vAuthConverter.java @@ -12,17 +12,16 @@ public class vAuthConverter implements Converter { public DataSource database; public CommandSender sender; - public vAuthConverter(AuthMe plugin, DataSource database, - CommandSender sender) { + public vAuthConverter(AuthMe plugin, CommandSender sender) { this.plugin = plugin; - this.database = database; + this.database = plugin.database; this.sender = sender; } @Override public void run() { try { - new vAuthFileReader(plugin, database, sender).convert(); + new vAuthFileReader(plugin, sender).convert(); } catch (Exception e) { sender.sendMessage(e.getMessage()); ConsoleLogger.showError(e.getMessage()); diff --git a/src/main/java/fr/xephi/authme/converter/vAuthFileReader.java b/src/main/java/fr/xephi/authme/converter/vAuthFileReader.java index 55cbec588..5b2a0be99 100644 --- a/src/main/java/fr/xephi/authme/converter/vAuthFileReader.java +++ b/src/main/java/fr/xephi/authme/converter/vAuthFileReader.java @@ -19,10 +19,9 @@ public class vAuthFileReader { public DataSource database; public CommandSender sender; - public vAuthFileReader(AuthMe plugin, DataSource database, - CommandSender sender) { + public vAuthFileReader(AuthMe plugin, CommandSender sender) { this.plugin = plugin; - this.database = database; + this.database = plugin.database; this.sender = sender; } diff --git a/src/main/java/fr/xephi/authme/converter/xAuthConverter.java b/src/main/java/fr/xephi/authme/converter/xAuthConverter.java index 46f549ead..1f8136682 100644 --- a/src/main/java/fr/xephi/authme/converter/xAuthConverter.java +++ b/src/main/java/fr/xephi/authme/converter/xAuthConverter.java @@ -3,18 +3,14 @@ package fr.xephi.authme.converter; import org.bukkit.command.CommandSender; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.datasource.DataSource; public class xAuthConverter implements Converter { public AuthMe plugin; - public DataSource database; public CommandSender sender; - public xAuthConverter(AuthMe plugin, DataSource database, - CommandSender sender) { + public xAuthConverter(AuthMe plugin, CommandSender sender) { this.plugin = plugin; - this.database = database; this.sender = sender; } @@ -22,7 +18,7 @@ public class xAuthConverter implements Converter { public void run() { try { Class.forName("de.luricos.bukkit.xAuth.xAuth"); - xAuthToFlat converter = new xAuthToFlat(plugin, database, sender); + xAuthToFlat converter = new xAuthToFlat(plugin, sender); converter.convert(); } catch (ClassNotFoundException ce) { sender.sendMessage("xAuth has not been found, please put xAuth.jar in your plugin folder and restart!"); diff --git a/src/main/java/fr/xephi/authme/converter/xAuthToFlat.java b/src/main/java/fr/xephi/authme/converter/xAuthToFlat.java index 02d9946f5..e8ac1c9a6 100644 --- a/src/main/java/fr/xephi/authme/converter/xAuthToFlat.java +++ b/src/main/java/fr/xephi/authme/converter/xAuthToFlat.java @@ -23,10 +23,9 @@ public class xAuthToFlat { public DataSource database; public CommandSender sender; - public xAuthToFlat(AuthMe instance, DataSource database, - CommandSender sender) { + public xAuthToFlat(AuthMe instance, CommandSender sender) { this.instance = instance; - this.database = database; + this.database = instance.database; this.sender = sender; } diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java index d706f0953..763797109 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMeBlockListener.java @@ -9,16 +9,14 @@ import org.bukkit.event.block.BlockPlaceEvent; import fr.xephi.authme.AuthMe; import fr.xephi.authme.Utils; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.settings.Settings; public class AuthMeBlockListener implements Listener { - private DataSource data; public AuthMe instance; - public AuthMeBlockListener(DataSource data, AuthMe instance) { - this.data = data; + public AuthMeBlockListener(AuthMe instance) { + this.instance = instance; } @@ -39,7 +37,7 @@ public class AuthMeBlockListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!instance.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -64,7 +62,7 @@ public class AuthMeBlockListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!instance.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeChestShopListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeChestShopListener.java index ae3c41aa2..563218759 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMeChestShopListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMeChestShopListener.java @@ -11,16 +11,13 @@ import com.Acrobot.ChestShop.Events.PreTransactionEvent.TransactionOutcome; import fr.xephi.authme.AuthMe; import fr.xephi.authme.Utils; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.settings.Settings; public class AuthMeChestShopListener implements Listener { - public DataSource database; public AuthMe plugin; - public AuthMeChestShopListener(DataSource database, AuthMe plugin) { - this.database = database; + public AuthMeChestShopListener(AuthMe plugin) { this.plugin = plugin; } @@ -41,7 +38,7 @@ public class AuthMeChestShopListener implements Listener { return; } - if (!database.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java index 56b637e94..f0a62591e 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java @@ -15,17 +15,14 @@ import org.bukkit.event.entity.FoodLevelChangeEvent; import fr.xephi.authme.AuthMe; import fr.xephi.authme.Utils; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.plugin.manager.CombatTagComunicator; import fr.xephi.authme.settings.Settings; public class AuthMeEntityListener implements Listener { - private DataSource data; public AuthMe instance; - public AuthMeEntityListener(DataSource data, AuthMe instance) { - this.data = data; + public AuthMeEntityListener(AuthMe instance) { this.instance = instance; } @@ -57,7 +54,7 @@ public class AuthMeEntityListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!instance.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -89,7 +86,7 @@ public class AuthMeEntityListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!instance.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -117,7 +114,7 @@ public class AuthMeEntityListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!instance.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -147,7 +144,7 @@ public class AuthMeEntityListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!instance.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -178,7 +175,7 @@ public class AuthMeEntityListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!instance.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -212,7 +209,7 @@ public class AuthMeEntityListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!instance.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -244,7 +241,7 @@ public class AuthMeEntityListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!instance.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index cda89dc58..ac1551de8 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -43,7 +43,6 @@ import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.cache.limbo.LimboCache; import fr.xephi.authme.cache.limbo.LimboPlayer; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.plugin.manager.CombatTagComunicator; import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.Settings; @@ -54,13 +53,11 @@ public class AuthMePlayerListener implements Listener { public static ConcurrentHashMap joinMessage = new ConcurrentHashMap(); private Messages m = Messages.getInstance(); public AuthMe plugin; - private DataSource data; public static ConcurrentHashMap causeByAuthMe = new ConcurrentHashMap(); private List antibot = new ArrayList(); - public AuthMePlayerListener(AuthMe plugin, DataSource data) { + public AuthMePlayerListener(AuthMe plugin) { this.plugin = plugin; - this.data = data; } @EventHandler(priority = EventPriority.LOWEST) @@ -77,7 +74,7 @@ public class AuthMePlayerListener implements Listener { if (PlayerCache.getInstance().isAuthenticated(name)) return; - if (!data.isAuthAvailable(name)) + if (!plugin.database.isAuthAvailable(name)) if (!Settings.isForcedRegistrationEnabled) return; @@ -113,7 +110,7 @@ public class AuthMePlayerListener implements Listener { String cmd = event.getMessage().split(" ")[0]; - if (data.isAuthAvailable(name)) { + if (plugin.database.isAuthAvailable(name)) { m.send(player, "login_msg"); } else { if (!Settings.isForcedRegistrationEnabled) { @@ -150,7 +147,7 @@ public class AuthMePlayerListener implements Listener { String cmd = event.getMessage().split(" ")[0]; - if (data.isAuthAvailable(name)) { + if (plugin.database.isAuthAvailable(name)) { m.send(player, "login_msg"); } else { if (!Settings.isForcedRegistrationEnabled) { @@ -187,7 +184,7 @@ public class AuthMePlayerListener implements Listener { String cmd = event.getMessage().split(" ")[0]; - if (data.isAuthAvailable(name)) { + if (plugin.database.isAuthAvailable(name)) { m.send(player, "login_msg"); } else { if (!Settings.isForcedRegistrationEnabled) { @@ -224,7 +221,7 @@ public class AuthMePlayerListener implements Listener { String cmd = event.getMessage().split(" ")[0]; - if (data.isAuthAvailable(name)) { + if (plugin.database.isAuthAvailable(name)) { m.send(player, "login_msg"); } else { if (!Settings.isForcedRegistrationEnabled) { @@ -262,7 +259,7 @@ public class AuthMePlayerListener implements Listener { String cmd = event.getMessage().split(" ")[0]; - if (data.isAuthAvailable(name)) { + if (plugin.database.isAuthAvailable(name)) { m.send(player, "login_msg"); } else { if (!Settings.isForcedRegistrationEnabled) { @@ -299,7 +296,7 @@ public class AuthMePlayerListener implements Listener { String cmd = event.getMessage().split(" ")[0]; - if (data.isAuthAvailable(name)) { + if (plugin.database.isAuthAvailable(name)) { m.send(player, "login_msg"); } else { if (!Settings.isForcedRegistrationEnabled) { @@ -336,7 +333,7 @@ public class AuthMePlayerListener implements Listener { } if (!Settings.isForcedRegistrationEnabled) { - if (!data.isAuthAvailable(name)) + if (!plugin.database.isAuthAvailable(name)) return; } @@ -404,7 +401,7 @@ public class AuthMePlayerListener implements Listener { if (player == null) return; final String name = player.getName().toLowerCase(); - boolean isAuthAvailable = data.isAuthAvailable(name); + boolean isAuthAvailable = plugin.database.isAuthAvailable(name); if (plugin.getCitizensCommunicator().isNPC(player) || Utils.getInstance().isUnrestricted(player) || CombatTagComunicator.isNPC(player)) { return; @@ -428,7 +425,7 @@ public class AuthMePlayerListener implements Listener { } if (Settings.isKickNonRegisteredEnabled) { - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { event.setKickMessage(m.send("reg_only")[0]); event.setResult(PlayerLoginEvent.Result.KICK_OTHER); return; @@ -579,7 +576,7 @@ public class AuthMePlayerListener implements Listener { plugin.management.performQuit(player, false); - if (data.getAuth(name) != null && !PlayerCache.getInstance().isAuthenticated(name) && Settings.enableProtection) + if (plugin.database.getAuth(name) != null && !PlayerCache.getInstance().isAuthenticated(name) && Settings.enableProtection) event.setQuitMessage(null); } @@ -622,7 +619,7 @@ public class AuthMePlayerListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -650,7 +647,7 @@ public class AuthMePlayerListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -679,7 +676,7 @@ public class AuthMePlayerListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -708,7 +705,7 @@ public class AuthMePlayerListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -734,7 +731,7 @@ public class AuthMePlayerListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -761,7 +758,7 @@ public class AuthMePlayerListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -785,7 +782,7 @@ public class AuthMePlayerListener implements Listener { return; } - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -806,7 +803,7 @@ public class AuthMePlayerListener implements Listener { if (PlayerCache.getInstance().isAuthenticated(name)) { return; } - if (!data.isAuthAvailable(name)) { + if (!plugin.database.isAuthAvailable(name)) { if (!Settings.isForcedRegistrationEnabled) { return; } @@ -832,15 +829,15 @@ public class AuthMePlayerListener implements Listener { if (PlayerCache.getInstance().isAuthenticated(name)) return; - if (!data.isAuthAvailable(name)) + if (!plugin.database.isAuthAvailable(name)) if (!Settings.isForcedRegistrationEnabled) return; Location spawn = plugin.getSpawnLocation(player); - if (Settings.isSaveQuitLocationEnabled && data.isAuthAvailable(name)) { + if (Settings.isSaveQuitLocationEnabled && plugin.database.isAuthAvailable(name)) { final PlayerAuth auth = new PlayerAuth(name, spawn.getX(), spawn.getY(), spawn.getZ(), spawn.getWorld().getName()); try { - data.updateQuitLoc(auth); + plugin.database.updateQuitLoc(auth); } catch (NullPointerException npe) { } } @@ -871,7 +868,7 @@ public class AuthMePlayerListener implements Listener { if (PlayerCache.getInstance().isAuthenticated(name)) return; - if (!data.isAuthAvailable(name)) + if (!plugin.database.isAuthAvailable(name)) if (!Settings.isForcedRegistrationEnabled) return; diff --git a/src/main/java/fr/xephi/authme/process/Management.java b/src/main/java/fr/xephi/authme/process/Management.java index 45fc97fa9..479790e58 100644 --- a/src/main/java/fr/xephi/authme/process/Management.java +++ b/src/main/java/fr/xephi/authme/process/Management.java @@ -5,7 +5,6 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import fr.xephi.authme.AuthMe; -import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.process.join.AsyncronousJoin; import fr.xephi.authme.process.login.AsyncronousLogin; import fr.xephi.authme.process.logout.AsyncronousLogout; @@ -22,13 +21,11 @@ import fr.xephi.authme.settings.Settings; */ public class Management { - public DataSource database; public AuthMe plugin; public static RandomString rdm = new RandomString(Settings.captchaLength); public PluginManager pm; - public Management(DataSource database, AuthMe plugin) { - this.database = database; + public Management(AuthMe plugin) { this.plugin = plugin; this.pm = plugin.getServer().getPluginManager(); } @@ -39,7 +36,7 @@ public class Management { @Override public void run() { - new AsyncronousLogin(player, password, forceLogin, plugin, database).process(); + new AsyncronousLogin(player, password, forceLogin, plugin, plugin.database).process(); } }); } @@ -50,7 +47,7 @@ public class Management { @Override public void run() { - new AsyncronousRegister(player, password, email, plugin, database).process(); + new AsyncronousRegister(player, password, email, plugin, plugin.database).process(); } }); } @@ -60,7 +57,7 @@ public class Management { @Override public void run() { - new AsyncronousLogout(player, plugin, database).process(); + new AsyncronousLogout(player, plugin, plugin.database).process(); } }); } @@ -70,7 +67,7 @@ public class Management { @Override public void run() { - new AsyncronousQuit(player, plugin, database, isKick).process(); + new AsyncronousQuit(player, plugin, plugin.database, isKick).process(); } }); @@ -81,7 +78,7 @@ public class Management { @Override public void run() { - new AsyncronousJoin(player, plugin, database).process(); + new AsyncronousJoin(player, plugin, plugin.database).process(); } }); From 63a90abec14f4855c7e010ecf99feb5721ff37a3 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Fri, 10 Jul 2015 12:00:26 +0200 Subject: [PATCH 02/14] Change how PlayersLogs work - Change how reload work --- src/main/java/fr/xephi/authme/AuthMe.java | 37 +++------------ .../xephi/authme/cache/auth/PlayerCache.java | 4 ++ .../fr/xephi/authme/datasource/FlatFile.java | 7 +-- .../fr/xephi/authme/datasource/SQLite.java | 11 +++-- .../process/register/AsyncronousRegister.java | 5 +- .../ProcessSyncronousPasswordRegister.java | 3 +- .../fr/xephi/authme/settings/PlayersLogs.java | 47 ++++++++++++------- 7 files changed, 53 insertions(+), 61 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index ec7cea77d..450e83564 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -12,8 +12,6 @@ import java.net.URL; import java.net.URLConnection; import java.util.Calendar; import java.util.Collection; -import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; @@ -80,7 +78,6 @@ public class AuthMe extends JavaPlugin { public DataSource database = null; private Settings settings; private Messages m; - public PlayersLogs pllog; public OtherAccounts otherAccounts; public static Server server; public static Logger authmeLogger = Logger.getLogger("AuthMe"); @@ -97,9 +94,9 @@ public class AuthMe extends JavaPlugin { public Essentials ess; public API api; public Management management; - public HashMap captcha = new HashMap(); - public HashMap cap = new HashMap(); - public HashMap realIp = new HashMap(); + 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; @@ -151,8 +148,6 @@ public class AuthMe extends JavaPlugin { m = Messages.getInstance(); - pllog = PlayersLogs.getInstance(); - otherAccounts = OtherAccounts.getInstance(); server = getServer(); @@ -246,9 +241,10 @@ public class AuthMe extends JavaPlugin { ConsoleLogger.showError("BECAREFUL !!! By disabling ForceSingleSession, your server protection is set to LOW"); } + PlayersLogs.getInstance(); + if (Settings.reloadSupport) try { - onReload(); int playersOnline = 0; try { if (Bukkit.class.getMethod("getOnlinePlayers", new Class[0]).getReturnType() == Collection.class) @@ -261,7 +257,7 @@ public class AuthMe extends JavaPlugin { database.purgeLogged(); } catch (NullPointerException npe) { } - } + } else PlayersLogs.getInstance().loadPlayers(); } catch (Exception ex) { } @@ -432,27 +428,6 @@ public class AuthMe extends JavaPlugin { ConsoleLogger.info("Authme " + this.getDescription().getVersion() + " disabled"); } - private void onReload() { - try { - if (Bukkit.getServer().getOnlinePlayers() != null) { - for (Player player : Bukkit.getServer().getOnlinePlayers()) { - if (database.isLogged(player.getName().toLowerCase())) { - String name = player.getName().toLowerCase(); - PlayerAuth pAuth = database.getAuth(name); - if (pAuth == null) - break; - PlayerAuth auth = new PlayerAuth(name, pAuth.getHash(), pAuth.getIp(), new Date().getTime(), pAuth.getEmail()); - database.updateSession(auth); - PlayerCache.getInstance().addPlayer(auth); - } - } - } - return; - } catch (Exception ex) { - return; - } - } - public static AuthMe getInstance() { return authme; } diff --git a/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java b/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java index a517c7568..17911bdc8 100644 --- a/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java +++ b/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java @@ -43,4 +43,8 @@ public class PlayerCache { return cache.size(); } + public ConcurrentHashMap getCache() { + return this.cache; + } + } diff --git a/src/main/java/fr/xephi/authme/datasource/FlatFile.java b/src/main/java/fr/xephi/authme/datasource/FlatFile.java index 654f72e56..825579f44 100644 --- a/src/main/java/fr/xephi/authme/datasource/FlatFile.java +++ b/src/main/java/fr/xephi/authme/datasource/FlatFile.java @@ -13,6 +13,7 @@ import java.util.List; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.settings.PlayersLogs; import fr.xephi.authme.settings.Settings; @@ -648,17 +649,17 @@ public class FlatFile implements DataSource { @Override public boolean isLogged(String user) { - return PlayersLogs.getInstance().players.contains(user.toLowerCase()); + return PlayerCache.getInstance().isAuthenticated(user); } @Override public void setLogged(String user) { - PlayersLogs.getInstance().addPlayer(user.toLowerCase()); + PlayersLogs.getInstance().savePlayerLogs(); } @Override public void setUnlogged(String user) { - PlayersLogs.getInstance().removePlayer(user.toLowerCase()); + PlayersLogs.getInstance().savePlayerLogs(); } @Override diff --git a/src/main/java/fr/xephi/authme/datasource/SQLite.java b/src/main/java/fr/xephi/authme/datasource/SQLite.java index cdbac8493..674aa449c 100644 --- a/src/main/java/fr/xephi/authme/datasource/SQLite.java +++ b/src/main/java/fr/xephi/authme/datasource/SQLite.java @@ -12,6 +12,7 @@ import java.util.List; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.datasource.MiniConnectionPoolManager.TimeoutException; import fr.xephi.authme.settings.PlayersLogs; import fr.xephi.authme.settings.Settings; @@ -74,8 +75,8 @@ public class SQLite implements DataSource { } } - private synchronized void connect() throws ClassNotFoundException, - SQLException { + private synchronized void connect() + throws ClassNotFoundException, SQLException { Class.forName("org.sqlite.JDBC"); ConsoleLogger.info("SQLite driver loaded"); this.con = DriverManager.getConnection("jdbc:sqlite:plugins/AuthMe/" + database + ".db"); @@ -508,17 +509,17 @@ public class SQLite implements DataSource { @Override public boolean isLogged(String user) { - return PlayersLogs.getInstance().players.contains(user.toLowerCase()); + return PlayerCache.getInstance().isAuthenticated(user); } @Override public void setLogged(String user) { - PlayersLogs.getInstance().addPlayer(user.toLowerCase()); + PlayersLogs.getInstance().savePlayerLogs(); } @Override public void setUnlogged(String user) { - PlayersLogs.getInstance().removePlayer(user.toLowerCase()); + PlayersLogs.getInstance().savePlayerLogs(); } @Override diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java index 0a6be53f7..774471946 100644 --- a/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java @@ -12,6 +12,7 @@ import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.datasource.DataSource; import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.settings.Messages; +import fr.xephi.authme.settings.PlayersLogs; import fr.xephi.authme.settings.Settings; public class AsyncronousRegister { @@ -64,9 +65,7 @@ public class AsyncronousRegister { else if (database.isAuthAvailable(name)) { m.send(player, "user_regged"); - if (plugin.pllog.getStringList("players").contains(name)) { - plugin.pllog.getStringList("players").remove(name); - } + PlayersLogs.getInstance().savePlayerLogs(); allowRegister = false; } diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java index cf0544565..c2ffe57fd 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java @@ -17,6 +17,7 @@ import fr.xephi.authme.events.AuthMeTeleportEvent; import fr.xephi.authme.events.LoginEvent; import fr.xephi.authme.events.RegisterTeleportEvent; import fr.xephi.authme.settings.Messages; +import fr.xephi.authme.settings.PlayersLogs; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; import fr.xephi.authme.task.TimeoutTask; @@ -71,7 +72,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable { BukkitTask msgT = sched.runTaskAsynchronously(plugin, new MessageTask(plugin, name, m.send("login_msg"), interval)); LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(msgT); try { - plugin.pllog.removePlayer(name); + PlayersLogs.getInstance().save(); if (player.isInsideVehicle()) player.getVehicle().eject(); } catch (NullPointerException npe) { diff --git a/src/main/java/fr/xephi/authme/settings/PlayersLogs.java b/src/main/java/fr/xephi/authme/settings/PlayersLogs.java index b95d2098e..7e827fa54 100644 --- a/src/main/java/fr/xephi/authme/settings/PlayersLogs.java +++ b/src/main/java/fr/xephi/authme/settings/PlayersLogs.java @@ -2,8 +2,14 @@ package fr.xephi.authme.settings; import java.io.File; import java.util.ArrayList; +import java.util.Date; import java.util.List; +import fr.xephi.authme.AuthMe; +import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.cache.auth.PlayerCache; +import fr.xephi.authme.datasource.DataSource; + /** * * @author Xephi59 @@ -11,19 +17,27 @@ import java.util.List; public class PlayersLogs extends CustomConfiguration { private static PlayersLogs pllog = null; - public List players; public PlayersLogs() { super(new File("." + File.separator + "plugins" + File.separator + "AuthMe" + File.separator + "players.yml")); pllog = this; load(); save(); - players = this.getStringList("players"); } - public void clear() { - set("players", new ArrayList()); - save(); + public void loadPlayers() { + DataSource database = AuthMe.getInstance().database; + List list = this.getStringList("players"); + if (list == null || list.isEmpty()) + return; + for (String s : list) { + PlayerAuth auth = database.getAuth(s); + if (auth == null) + continue; + auth.setLastLogin(new Date().getTime()); + database.updateSession(auth); + PlayerCache.getInstance().addPlayer(auth); + } } public static PlayersLogs getInstance() { @@ -33,21 +47,18 @@ public class PlayersLogs extends CustomConfiguration { return pllog; } - public void addPlayer(String user) { - players = this.getStringList("players"); - if (!players.contains(user.toLowerCase())) { - players.add(user.toLowerCase()); - set("players", players); - save(); + public void savePlayerLogs() { + List players = new ArrayList(); + for (String s : PlayerCache.getInstance().getCache().keySet()) { + players.add(s); } + this.set("players", players); + this.save(); } - public void removePlayer(String user) { - players = this.getStringList("players"); - if (players.contains(user.toLowerCase())) { - players.remove(user.toLowerCase()); - set("players", players); - save(); - } + public void clear() { + this.set("players", new ArrayList()); + this.save(); } + } From a8194ac1ed1dd17e8301845b6c4bbddfe4058592 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Fri, 10 Jul 2015 12:05:49 +0200 Subject: [PATCH 03/14] change repo order --- pom.xml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index a6bacb27e..e3c95a0dd 100644 --- a/pom.xml +++ b/pom.xml @@ -119,16 +119,10 @@ https://hub.spigotmc.org/nexus/content/repositories/snapshots - + - Plugin Metrics - http://repo.mcstats.org/content/repositories/releases - - - - - vault-repo - http://nexus.theyeticave.net/content/repositories/pub_releases + ess-repo + http://repo.ess3.net/content/groups/public @@ -137,24 +131,12 @@ http://repo.citizensnpcs.co - - - ess-repo - http://repo.ess3.net/content/groups/essentials - - minelink-thirdparty http://repo.minelink.net/content/repositories/public - - - luricos-releases - http://repo.luricos.de/content/repositories/bukkit-plugins - - comphenix-snapshots @@ -167,6 +149,24 @@ http://repo.onarandombox.com/content/repositories/multiverse + + + vault-repo + http://nexus.theyeticave.net/content/repositories/pub_releases + + + + + Plugin Metrics + http://repo.mcstats.org/content/repositories/releases + + + + + luricos-releases + http://repo.luricos.de/content/repositories/bukkit-plugins + + From d851eb5f077741c2578b75e5a0e89ca1fa01ce2a Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Fri, 10 Jul 2015 12:10:33 +0200 Subject: [PATCH 04/14] Change to provided as readme said --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3c95a0dd..9817d3ab0 100644 --- a/pom.xml +++ b/pom.xml @@ -248,6 +248,7 @@ net.milkbowl.vault VaultAPI 1.5 + provided org.bukkit @@ -300,7 +301,7 @@ net.ess3 Essentials - 2.13-SNAPSHOT + 2.14-SNAPSHOT org.bukkit From 4b274b1ef60c84923ccb51396e2fbf8144fdd439 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Fri, 10 Jul 2015 12:17:52 +0200 Subject: [PATCH 05/14] Some ignores --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index 9817d3ab0..f169390a1 100644 --- a/pom.xml +++ b/pom.xml @@ -328,6 +328,22 @@ org.bukkit craftbukkit + + net.minelink + CombatTagPlusCompat-* + + + net.minelink + CombatTagPlusHook + + + net.minelink + CombatTagPlusFactions-* + + + net.minelink + CombatTagPlusWG-* + From 2255b9b6dbfd5c04bc11cf5412a1a9e8b9283457 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Fri, 10 Jul 2015 12:19:04 +0200 Subject: [PATCH 06/14] Revert previous commit --- pom.xml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pom.xml b/pom.xml index f169390a1..9817d3ab0 100644 --- a/pom.xml +++ b/pom.xml @@ -328,22 +328,6 @@ org.bukkit craftbukkit - - net.minelink - CombatTagPlusCompat-* - - - net.minelink - CombatTagPlusHook - - - net.minelink - CombatTagPlusFactions-* - - - net.minelink - CombatTagPlusWG-* - From beef5620caa287bcad4c0c697fc12d9773598a59 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 10 Jul 2015 14:41:17 +0200 Subject: [PATCH 07/14] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9817d3ab0..48cf9a5e2 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ onarandombox - http://repo.onarandombox.com/content/repositories/multiverse + http://repo.onarandombox.com/content/groups/public From 4ef6c47a6491cb273b32633edcf862273e3596be Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Fri, 10 Jul 2015 14:49:17 +0200 Subject: [PATCH 08/14] Temp fix --- src/main/java/fr/xephi/authme/AuthMe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 450e83564..82697f2df 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -582,7 +582,7 @@ public class AuthMe extends JavaPlugin { return Spawn.getInstance().getFirstSpawn(); if (Spawn.getInstance().getSpawn() != null) return Spawn.getInstance().getSpawn(); - return this.getServer().getWorld(Settings.defaultWorld).getSpawnLocation(); + return player.getWorld().getSpawnLocation(); } public void downloadGeoIp() { From 7857e322a5a2b7225be6b91ed6f97c750e27d12b Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 10 Jul 2015 16:07:02 +0200 Subject: [PATCH 09/14] Update pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 48cf9a5e2..1a1836104 100644 --- a/pom.xml +++ b/pom.xml @@ -125,10 +125,10 @@ http://repo.ess3.net/content/groups/public - + - citizens-repo - http://repo.citizensnpcs.co + citizensapi-repo + http://ci.citizensnpcs.co/plugin/repository/project/CitizensAPI/LastSuccessful/repository/ From 0496d2049c49356d85082dc8176230ae7fd84cf8 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 10 Jul 2015 16:19:13 +0200 Subject: [PATCH 10/14] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a1836104..04ad02c7a 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots + https://hub.spigotmc.org/nexus/content/groups/public From a72c206a6c139b20e073b14db7f3e771c03d1f9d Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 10 Jul 2015 16:22:39 +0200 Subject: [PATCH 11/14] Update pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 04ad02c7a..117a7d205 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ citizensapi-repo - http://ci.citizensnpcs.co/plugin/repository/project/CitizensAPI/LastSuccessful/repository/ + http://ci.citizensnpcs.co/plugin/repository/project/CitizensAPI/LastSuccessful/repository @@ -140,7 +140,7 @@ comphenix-snapshots - http://repo.comphenix.net/content/repositories/snapshots + http://repo.comphenix.net/content/repositories/public @@ -164,7 +164,7 @@ luricos-releases - http://repo.luricos.de/content/repositories/bukkit-plugins + http://repo.luricos.de/content/repositories/releases From ce78d08be905392155acd98078d2f3bf415091f2 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 10 Jul 2015 17:37:12 +0200 Subject: [PATCH 12/14] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6b0f1404..301e30249 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ sudo: false language: java jdk: oraclejdk7 -cache: - directories: - - '$HOME/.m2/repository' +#cache: +# directories: +# - '$HOME/.m2/repository' script: - mvn clean install -B && mvn clean -B From 86aa8f7cce4e3c9247c3d014aa081fc15fd55ee3 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 10 Jul 2015 17:43:40 +0200 Subject: [PATCH 13/14] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 301e30249..3f9a86108 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -sudo: false +#sudo: false language: java jdk: oraclejdk7 From 145e43ffd9f7613262dd6d3cfd3efdd332a2e158 Mon Sep 17 00:00:00 2001 From: "Gabriele C." Date: Fri, 10 Jul 2015 17:50:11 +0200 Subject: [PATCH 14/14] Update .travis.yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f9a86108..f6b0f1404 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ -#sudo: false +sudo: false language: java jdk: oraclejdk7 -#cache: -# directories: -# - '$HOME/.m2/repository' +cache: + directories: + - '$HOME/.m2/repository' script: - mvn clean install -B && mvn clean -B