Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stuff from the common floobits workspace

Browse Source 
Author:    AuthMe-Team <AuthMeTeam@123NoEmail.com>
This commit is contained in:
AuthMe-Team
2015-11-23 20:20:42 +01:00
committed by Gabriele C
parent 69a09aec17
commit 9ec2d6d059
169 changed files with 5161 additions and 4806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/process/Management.java
+21 -14
View File
@@ -1,8 +1,5 @@
package fr.xephi.authme.process;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.process.email.AsyncChangeEmail;
import fr.xephi.authme.process.join.AsyncronousJoin;
@@ -13,20 +10,22 @@ import fr.xephi.authme.process.register.AsyncRegister;
import fr.xephi.authme.process.unregister.AsyncronousUnregister;
import fr.xephi.authme.security.RandomString;
import fr.xephi.authme.settings.Settings;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
/**
* @author Gabriele
* @version $Revision: 1.0 $
*/
public class Management {
public static RandomString rdm = new RandomString(Settings.captchaLength);
private final AuthMe plugin;
private final BukkitScheduler sched;
public static RandomString rdm = new RandomString(Settings.captchaLength);
/**
* Constructor for Management.
*
* @param plugin AuthMe
*/
public Management(AuthMe plugin) {
@@ -36,8 +35,9 @@ public class Management {
/**
* Method performLogin.
* @param player Player
* @param password String
*
* @param player Player
* @param password String
* @param forceLogin boolean
*/
public void performLogin(final Player player, final String password, final boolean forceLogin) {
@@ -52,6 +52,7 @@ public class Management {
/**
* Method performLogout.
*
* @param player Player
*/
public void performLogout(final Player player) {
@@ -66,9 +67,10 @@ public class Management {
/**
* Method performRegister.
* @param player Player
*
* @param player Player
* @param password String
* @param email String
* @param email String
*/
public void performRegister(final Player player, final String password, final String email) {
sched.runTaskAsynchronously(plugin, new Runnable() {
@@ -82,9 +84,10 @@ public class Management {
/**
* Method performUnregister.
* @param player Player
*
* @param player Player
* @param password String
* @param force boolean
* @param force boolean
*/
public void performUnregister(final Player player, final String password, final boolean force) {
sched.runTaskAsynchronously(plugin, new Runnable() {
@@ -98,6 +101,7 @@ public class Management {
/**
* Method performJoin.
*
* @param player Player
*/
public void performJoin(final Player player) {
@@ -113,6 +117,7 @@ public class Management {
/**
* Method performQuit.
*
* @param player Player
* @param isKick boolean
*/
@@ -129,8 +134,9 @@ public class Management {
/**
* Method performAddEmail.
* @param player Player
* @param newEmail String
*
* @param player Player
* @param newEmail String
* @param newEmailVerify String
*/
public void performAddEmail(final Player player, final String newEmail, final String newEmailVerify) {
@@ -144,7 +150,8 @@ public class Management {
/**
* Method performChangeEmail.
* @param player Player
*
* @param player Player
* @param oldEmail String
* @param newEmail String
*/
src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
+11 -10
View File
@@ -1,15 +1,14 @@
package fr.xephi.authme.process.email;
import java.util.Arrays;
import org.bukkit.entity.Player;
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.Messages;
import fr.xephi.authme.settings.Settings;
import org.bukkit.entity.Player;
import java.util.Arrays;
/**
*/
@@ -24,10 +23,11 @@ public class AsyncChangeEmail {
/**
* Constructor for AsyncChangeEmail.
* @param player Player
* @param plugin AuthMe
* @param oldEmail String
* @param newEmail String
*
* @param player Player
* @param plugin AuthMe
* @param oldEmail String
* @param newEmail String
* @param newEmailVerify String
*/
public AsyncChangeEmail(Player player, AuthMe plugin, String oldEmail, String newEmail, String newEmailVerify) {
@@ -41,8 +41,9 @@ public class AsyncChangeEmail {
/**
* Constructor for AsyncChangeEmail.
* @param player Player
* @param plugin AuthMe
*
* @param player Player
* @param plugin AuthMe
* @param oldEmail String
* @param newEmail String
*/
src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
+19 -17
View File
@@ -1,15 +1,5 @@
package fr.xephi.authme.process.join;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -27,6 +17,15 @@ import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
/**
*/
@@ -41,8 +40,9 @@ public class AsyncronousJoin {
/**
* Constructor for AsyncronousJoin.
* @param player Player
* @param plugin AuthMe
*
* @param player Player
* @param plugin AuthMe
* @param database DataSource
*/
public AsyncronousJoin(Player player, AuthMe plugin, DataSource database) {
@@ -68,7 +68,7 @@ public class AsyncronousJoin {
}
if (!plugin.canConnect()) {
final GameMode gM = AuthMePlayerListener.gameMode.get(name);
final GameMode gM = AuthMePlayerListener.gameMode.get(name);
sched.scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
@@ -248,15 +248,16 @@ public class AsyncronousJoin {
}
String[] msg = isAuthAvailable ? m.send("login_msg") :
m.send("reg_" + (Settings.emailRegistration? "email_" : "") + "msg");
m.send("reg_" + (Settings.emailRegistration ? "email_" : "") + "msg");
BukkitTask msgTask = sched.runTaskAsynchronously(plugin, new MessageTask(plugin, name, msg, msgInterval));
LimboCache.getInstance().getLimboPlayer(name).setMessageTaskId(msgTask);
}
/**
* Method needFirstSpawn.
* @return boolean */
*
* @return boolean
*/
private boolean needFirstSpawn() {
if (player.hasPlayedBefore())
return false;
@@ -283,7 +284,8 @@ public class AsyncronousJoin {
/**
* Method placePlayerSafely.
* @param player Player
*
* @param player Player
* @param spawnLoc Location
*/
private void placePlayerSafely(final Player player, final Location spawnLoc) {
src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java
+23 -19
View File
@@ -1,12 +1,5 @@
package fr.xephi.authme.process.login;
import java.util.Date;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -21,11 +14,18 @@ import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.util.Utils;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import java.util.Date;
import java.util.List;
/**
*/
public class AsyncronousLogin {
private static RandomString rdm = new RandomString(Settings.captchaLength);
protected Player player;
protected String name;
protected String realName;
@@ -33,16 +33,16 @@ public class AsyncronousLogin {
protected boolean forceLogin;
private AuthMe plugin;
private DataSource database;
private static RandomString rdm = new RandomString(Settings.captchaLength);
private Messages m = Messages.getInstance();
/**
* Constructor for AsyncronousLogin.
* @param player Player
* @param password String
*
* @param player Player
* @param password String
* @param forceLogin boolean
* @param plugin AuthMe
* @param data DataSource
* @param plugin AuthMe
* @param data DataSource
*/
public AsyncronousLogin(Player player, String password, boolean forceLogin,
AuthMe plugin, DataSource data) {
@@ -57,16 +57,18 @@ public class AsyncronousLogin {
/**
* Method getIP.
* @return String */
*
* @return String
*/
protected String getIP() {
return plugin.getIP(player);
}
/**
* Method needsCaptcha.
* @return boolean */
*
* @return boolean
*/
protected boolean needsCaptcha() {
if (Settings.useCaptcha) {
if (!plugin.captcha.containsKey(name)) {
@@ -93,8 +95,9 @@ public class AsyncronousLogin {
/**
* Checks the precondition for authentication (like user known) and returns
* the playerAuth-State
* @return PlayerAuth */
*
* @return PlayerAuth
*/
protected PlayerAuth preAuth() {
if (PlayerCache.getInstance().isAuthenticated(name)) {
m.send(player, "logged_in");
@@ -221,8 +224,9 @@ public class AsyncronousLogin {
/**
* Method displayOtherAccounts.
*
* @param auth PlayerAuth
* @param p Player
* @param p Player
*/
public void displayOtherAccounts(PlayerAuth auth, Player p) {
if (!Settings.displayOtherAccounts) {
src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java
+17 -16
View File
@@ -1,11 +1,5 @@
package fr.xephi.authme.process.login;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager;
import org.bukkit.potion.PotionEffectType;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.backup.JsonCache;
@@ -20,6 +14,11 @@ import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager;
import org.bukkit.potion.PotionEffectType;
/**
*/
@@ -36,12 +35,13 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
/**
* Constructor for ProcessSyncronousPlayerLogin.
*
* @param player Player
* @param plugin AuthMe
* @param data DataSource
* @param data DataSource
*/
public ProcessSyncronousPlayerLogin(Player player, AuthMe plugin,
DataSource data) {
DataSource data) {
this.plugin = plugin;
this.database = data;
this.pm = plugin.getServer().getPluginManager();
@@ -54,8 +54,9 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
/**
* Method getLimbo.
* @return LimboPlayer */
*
* @return LimboPlayer
*/
public LimboPlayer getLimbo() {
return limbo;
}
@@ -65,7 +66,7 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
}
protected void restoreFlyghtState() {
if(Settings.isForceSurvivalModeEnabled) {
if (Settings.isForceSurvivalModeEnabled) {
player.setAllowFlight(false);
player.setFlying(false);
return;
@@ -117,6 +118,7 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
/**
* Method run.
*
* @see java.lang.Runnable#run()
*/
@Override
@@ -135,8 +137,7 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
} else {
teleportBackFromSpawn();
}
} else
if (Settings.isForceSpawnLocOnJoinEnabled && Settings.getForcedWorlds.contains(player.getWorld().getName())) {
} else if (Settings.isForceSpawnLocOnJoinEnabled && Settings.getForcedWorlds.contains(player.getWorld().getName())) {
teleportToSpawn();
} else if (Settings.isSaveQuitLocationEnabled && auth.getQuitLocY() != 0) {
packQuitLocation();
@@ -150,10 +151,10 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
} else {
player.setGameMode(limbo.getGameMode());
}
restoreFlyghtState();
if (Settings.protectInventoryBeforeLogInEnabled && plugin.inventoryProtector != null) {
if (Settings.protectInventoryBeforeLogInEnabled && plugin.inventoryProtector != null) {
restoreInventory();
}
@@ -167,7 +168,7 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
// We can now display the join message (if delayed)
String jm = AuthMePlayerListener.joinMessage.get(name);
if (jm != null) {
if(!jm.isEmpty()) {
if (!jm.isEmpty()) {
for (Player p : Utils.getOnlinePlayers()) {
if (p.isOnline())
p.sendMessage(jm);
src/main/java/fr/xephi/authme/process/logout/AsyncronousLogout.java
+6 -6
View File
@@ -1,8 +1,5 @@
package fr.xephi.authme.process.logout;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
@@ -11,6 +8,8 @@ import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
/**
*/
@@ -25,12 +24,13 @@ public class AsyncronousLogout {
/**
* Constructor for AsyncronousLogout.
* @param player Player
* @param plugin AuthMe
*
* @param player Player
* @param plugin AuthMe
* @param database DataSource
*/
public AsyncronousLogout(Player player, AuthMe plugin,
DataSource database) {
DataSource database) {
this.player = player;
this.plugin = plugin;
this.database = database;
src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java
+8 -7
View File
@@ -1,12 +1,5 @@
package fr.xephi.authme.process.logout;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.limbo.LimboCache;
@@ -15,6 +8,12 @@ import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
/**
*/
@@ -27,6 +26,7 @@ public class ProcessSyncronousPlayerLogout implements Runnable {
/**
* Constructor for ProcessSyncronousPlayerLogout.
*
* @param player Player
* @param plugin AuthMe
*/
@@ -38,6 +38,7 @@ public class ProcessSyncronousPlayerLogout implements Runnable {
/**
* Method run.
*
* @see java.lang.Runnable#run()
*/
@Override
src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
+9 -9
View File
@@ -1,10 +1,5 @@
package fr.xephi.authme.process.quit;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
@@ -14,6 +9,10 @@ import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.listener.AuthMePlayerListener;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.util.Utils;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
/**
*/
@@ -30,13 +29,14 @@ public class AsyncronousQuit {
/**
* Constructor for AsyncronousQuit.
* @param p Player
* @param plugin AuthMe
*
* @param p Player
* @param plugin AuthMe
* @param database DataSource
* @param isKick boolean
* @param isKick boolean
*/
public AsyncronousQuit(Player p, AuthMe plugin, DataSource database,
boolean isKick) {
boolean isKick) {
this.player = p;
this.plugin = plugin;
this.database = database;
src/main/java/fr/xephi/authme/process/quit/ProcessSyncronousPlayerQuit.java
+8 -7
View File
@@ -1,10 +1,9 @@
package fr.xephi.authme.process.quit;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.settings.Settings;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
/**
*/
@@ -18,10 +17,11 @@ public class ProcessSyncronousPlayerQuit implements Runnable {
/**
* Constructor for ProcessSyncronousPlayerQuit.
* @param plugin AuthMe
* @param player Player
* @param isOp boolean
* @param isFlying boolean
*
* @param plugin AuthMe
* @param player Player
* @param isOp boolean
* @param isFlying boolean
* @param needToChange boolean
*/
public ProcessSyncronousPlayerQuit(AuthMe plugin, Player player
@@ -36,6 +36,7 @@ public class ProcessSyncronousPlayerQuit implements Runnable {
/**
* Method run.
*
* @see java.lang.Runnable#run()
*/
@Override
src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
+18 -16
View File
@@ -1,10 +1,5 @@
package fr.xephi.authme.process.register;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
import org.bukkit.entity.Player;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -13,6 +8,10 @@ import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Messages;
import fr.xephi.authme.settings.Settings;
import org.bukkit.entity.Player;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
/**
*/
@@ -28,11 +27,12 @@ public class AsyncRegister {
/**
* Constructor for AsyncRegister.
* @param player Player
*
* @param player Player
* @param password String
* @param email String
* @param plugin AuthMe
* @param data DataSource
* @param email String
* @param plugin AuthMe
* @param data DataSource
*/
public AsyncRegister(Player player, String password, String email,
AuthMe plugin, DataSource data) {
@@ -46,17 +46,18 @@ public class AsyncRegister {
/**
* Method getIp.
* @return String */
*
* @return String
*/
protected String getIp() {
return plugin.getIP(player);
}
/**
* Method preRegisterCheck.
* @return boolean * @throws Exception */
*
* @return boolean * @throws Exception
*/
protected boolean preRegisterCheck() throws Exception {
String lowpass = password.toLowerCase();
if (PlayerCache.getInstance().isAuthenticated(name)) {
@@ -113,8 +114,9 @@ public class AsyncRegister {
/**
* Method emailRegister.
* @throws Exception */
*
* @throws Exception
*/
protected void emailRegister() throws Exception {
if (Settings.getmaxRegPerEmail > 0) {
if (!plugin.getPermissionsManager().hasPermission(player, "authme.allow2accounts") && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) {
src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java
+6 -5
View File
@@ -1,9 +1,5 @@
package fr.xephi.authme.process.register;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.limbo.LimboCache;
@@ -13,6 +9,9 @@ import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
/**
*/
@@ -25,6 +24,7 @@ public class ProcessSyncEmailRegister implements Runnable {
/**
* Constructor for ProcessSyncEmailRegister.
*
* @param player Player
* @param plugin AuthMe
*/
@@ -36,6 +36,7 @@ public class ProcessSyncEmailRegister implements Runnable {
/**
* Method run.
*
* @see java.lang.Runnable#run()
*/
@Override
@@ -54,7 +55,7 @@ public class ProcessSyncEmailRegister implements Runnable {
BukkitTask id = sched.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, player), time);
limbo.setTimeoutTaskId(id);
}
if (limbo != null){
if (limbo != null) {
limbo.getMessageTaskId().cancel();
BukkitTask nwMsg = sched.runTaskAsynchronously(plugin, new MessageTask(plugin, name, m.send("login_msg"), msgInterval));
limbo.setMessageTaskId(nwMsg);
src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java
+9 -7
View File
@@ -1,12 +1,5 @@
package fr.xephi.authme.process.register;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.limbo.LimboCache;
@@ -18,6 +11,12 @@ import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
/**
*/
@@ -30,6 +29,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
/**
* Constructor for ProcessSyncronousPasswordRegister.
*
* @param player Player
* @param plugin AuthMe
*/
@@ -53,6 +53,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
/**
* Method forceLogin.
*
* @param player Player
*/
protected void forceLogin(Player player) {
@@ -76,6 +77,7 @@ public class ProcessSyncronousPasswordRegister implements Runnable {
/**
* Method run.
*
* @see java.lang.Runnable#run()
*/
@Override
src/main/java/fr/xephi/authme/process/unregister/AsyncronousUnregister.java
+18 -17
View File
@@ -1,13 +1,5 @@
package fr.xephi.authme.process.unregister;
import java.security.NoSuchAlgorithmException;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerCache;
@@ -20,6 +12,13 @@ import fr.xephi.authme.task.MessageTask;
import fr.xephi.authme.task.TimeoutTask;
import fr.xephi.authme.util.Utils;
import fr.xephi.authme.util.Utils.GroupType;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import java.security.NoSuchAlgorithmException;
/**
*/
@@ -27,21 +26,22 @@ public class AsyncronousUnregister {
protected Player player;
protected String name;
protected String password;
protected boolean force;
private AuthMe plugin;
private Messages m = Messages.getInstance();
protected String password;
protected boolean force;
private JsonCache playerCache;
private JsonCache playerCache;
/**
* Constructor for AsyncronousUnregister.
* @param player Player
*
* @param player Player
* @param password String
* @param force boolean
* @param plugin AuthMe
* @param force boolean
* @param plugin AuthMe
*/
public AsyncronousUnregister(Player player, String password,
boolean force, AuthMe plugin) {
boolean force, AuthMe plugin) {
this.player = player;
this.password = password;
this.force = force;
@@ -52,8 +52,9 @@ public class AsyncronousUnregister {
/**
* Method getIp.
* @return String */
*
* @return String
*/
protected String getIp() {
return plugin.getIP(player);
}