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

Remove Case dependance, auto-update name on join into database (care

Browse Source 
forums users!)
This commit is contained in:
Xephi
2014-08-27 07:03:11 +02:00
parent 0d8ce9e3d8
commit 6cfd3f0a0b
37 changed files with 243 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/commands/AdminCommand.java
+12 -12
View File
@@ -162,14 +162,14 @@ public class AdminCommand implements CommandExecutor {
return true;
}
try {
if (database.getAuth(args[1].toLowerCase()) != null) {
PlayerAuth player = database.getAuth(args[1].toLowerCase());
if (database.getAuth(args[1]) != null) {
PlayerAuth player = database.getAuth(args[1]);
long lastLogin = player.getLastLogin();
Date d = new Date(lastLogin);
final long diff = System.currentTimeMillis() - lastLogin;
final String msg = (int) (diff / 86400000) + " days " + (int) (diff / 3600000 % 24) + " hours " + (int) (diff / 60000 % 60) + " mins " + (int) (diff / 1000 % 60) + " secs.";
String lastIP = player.getIp();
sender.sendMessage("[AuthMe] " + args[1].toLowerCase() + " lastlogin : " + d.toString());
sender.sendMessage("[AuthMe] " + args[1] + " lastlogin : " + d.toString());
sender.sendMessage("[AuthMe] The player : " + player.getNickname() + " is unlogged since " + msg);
sender.sendMessage("[AuthMe] LastPlayer IP : " + lastIP);
} else {
@@ -196,7 +196,7 @@ public class AdminCommand implements CommandExecutor {
PlayerAuth pAuth = null;
String message = "[AuthMe] ";
try {
pAuth = database.getAuth(arguments[1].toLowerCase());
pAuth = database.getAuth(arguments[1]);
} catch (NullPointerException npe) {
fSender.sendMessage("[AuthMe] This player is unknown");
return;
@@ -274,13 +274,13 @@ public class AdminCommand implements CommandExecutor {
return true;
}
try {
String name = args[1].toLowerCase();
String name = args[1];
if (database.isAuthAvailable(name)) {
m._(sender, "user_regged");
return true;
}
String hash = PasswordSecurity.getHash(Settings.getPasswordHash, args[2], name);
PlayerAuth auth = new PlayerAuth(name, hash, "198.18.0.1", 0L, "your@email.com", API.getPlayerRealName(name));
PlayerAuth auth = new PlayerAuth(name, hash, "198.18.0.1", 0L, "your@email.com");
if (PasswordSecurity.userSalt.containsKey(name) && PasswordSecurity.userSalt.get(name) != null)
auth.setSalt(PasswordSecurity.userSalt.get(name));
else auth.setSalt("");
@@ -300,7 +300,7 @@ public class AdminCommand implements CommandExecutor {
sender.sendMessage("Usage: /authme getemail playername");
return true;
}
String playername = args[1].toLowerCase();
String playername = args[1];
PlayerAuth getAuth = database.getAuth(playername);
if (getAuth == null) {
m._(sender, "unknown_user");
@@ -313,7 +313,7 @@ public class AdminCommand implements CommandExecutor {
sender.sendMessage("Usage: /authme chgemail playername email");
return true;
}
String playername = args[1].toLowerCase();
String playername = args[1];
PlayerAuth getAuth = database.getAuth(playername);
if (getAuth == null) {
m._(sender, "unknown_user");
@@ -356,7 +356,7 @@ public class AdminCommand implements CommandExecutor {
} else if (args[0].equalsIgnoreCase("purgebannedplayers")) {
List<String> bannedPlayers = new ArrayList<String>();
for (OfflinePlayer off : plugin.getServer().getBannedPlayers()) {
bannedPlayers.add(off.getName().toLowerCase());
bannedPlayers.add(off.getName());
}
database.purgeBanned(bannedPlayers);
if (Settings.purgeEssentialsFile && plugin.ess != null)
@@ -400,7 +400,7 @@ public class AdminCommand implements CommandExecutor {
return true;
}
try {
String name = args[1].toLowerCase();
String name = args[1];
String hash = PasswordSecurity.getHash(Settings.getPasswordHash, args[2], name);
PlayerAuth auth = null;
if (PlayerCache.getInstance().isAuthenticated(name)) {
@@ -433,7 +433,7 @@ public class AdminCommand implements CommandExecutor {
sender.sendMessage("Usage: /authme unregister playername");
return true;
}
String name = args[1].toLowerCase();
String name = args[1];
if (!database.isAuthAvailable(name)) {
m._(sender, "user_unknown");
return true;
@@ -482,7 +482,7 @@ public class AdminCommand implements CommandExecutor {
return true;
}
try {
String name = args[1].toLowerCase();
String name = args[1];
PlayerAuth auth = database.getAuth(name);
if (auth == null) {
sender.sendMessage("The player " + name + " is not registered ");
src/main/java/fr/xephi/authme/commands/CaptchaCommand.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class CaptchaCommand implements CommandExecutor {
}
Player player = (Player) sender;
String name = player.getName().toLowerCase();
String name = player.getName();
if (args.length == 0) {
m._(player, "usage_captcha");
src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class ChangePasswordCommand implements CommandExecutor {
}
Player player = (Player) sender;
String name = player.getName().toLowerCase();
String name = player.getName();
if (!PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "not_logged_in");
return true;
src/main/java/fr/xephi/authme/commands/EmailCommand.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class EmailCommand implements CommandExecutor {
}
Player player = (Player) sender;
String name = player.getName().toLowerCase();
String name = player.getName();
if (args.length == 0) {
m._(player, "usage_email_add");
src/main/java/fr/xephi/authme/commands/LogoutCommand.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class LogoutCommand implements CommandExecutor {
}
Player player = (Player) sender;
String name = player.getName().toLowerCase();
String name = player.getName();
if (!PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "not_logged_in");
src/main/java/fr/xephi/authme/commands/PasspartuCommand.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class PasspartuCommand implements CommandExecutor {
return true;
}
if (PlayerCache.getInstance().isAuthenticated(sender.getName().toLowerCase())) {
if (PlayerCache.getInstance().isAuthenticated(sender.getName())) {
return true;
}
src/main/java/fr/xephi/authme/commands/UnregisterCommand.java
+3 -3
View File
@@ -55,7 +55,7 @@ public class UnregisterCommand implements CommandExecutor {
}
Player player = (Player) sender;
String name = player.getName().toLowerCase();
String name = player.getName();
if (!PlayerCache.getInstance().isAuthenticated(name)) {
m._(player, "not_logged_in");
@@ -84,7 +84,7 @@ public class UnregisterCommand implements CommandExecutor {
player.getInventory().setContents(new ItemStack[36]);
player.getInventory().setArmorContents(new ItemStack[4]);
player.saveData();
PlayerCache.getInstance().removePlayer(player.getName().toLowerCase());
PlayerCache.getInstance().removePlayer(player.getName());
if (!Settings.getRegisteredGroup.isEmpty())
Utils.getInstance().setGroup(player, groupType.UNREGISTERED);
LimboCache.getInstance().addLimboPlayer(player);
@@ -106,7 +106,7 @@ public class UnregisterCommand implements CommandExecutor {
if (!Settings.unRegisteredGroup.isEmpty()) {
Utils.getInstance().setGroup(player, Utils.groupType.UNREGISTERED);
}
PlayerCache.getInstance().removePlayer(player.getName().toLowerCase());
PlayerCache.getInstance().removePlayer(player.getName());
// check if Player cache File Exist and delete it, preventing
// duplication of items
if (playerCache.doesCacheExist(player)) {