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

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor

Browse Source 
Conflicts:
	src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
	src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
	src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
This commit is contained in:
ljacqu
2015-12-12 14:25:01 +01:00
parent d5b2058124 2fc55c5e7f
commit 4d8d9de733
11 changed files with 256 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
+16 -31
View File
@@ -1,12 +1,10 @@
package fr.xephi.authme.command.executable.authme;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.command.ExecutableCommand;
import fr.xephi.authme.output.MessageKey;
import fr.xephi.authme.output.Messages;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import java.util.List;
@@ -20,30 +18,24 @@ public class AccountsCommand extends ExecutableCommand {
// Get the player query
String playerQuery = sender.getName();
if (arguments.size() >= 1)
playerQuery = arguments.get(0);
if (commandArguments.getCount() >= 1) {
playerQuery = commandArguments.get(0);
}
final String playerQueryFinal = playerQuery;
// Command logic
if (!playerQuery.contains(".")) {
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
if (!playerQueryFinal.contains(".")) {
plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override
public void run() {
PlayerAuth auth;
StringBuilder message = new StringBuilder("[AuthMe] ");
try {
auth = plugin.database.getAuth(playerQueryFinal.toLowerCase());
} catch (NullPointerException npe) {
m.send(sender, MessageKey.UNKNOWN_USER);
return;
}
PlayerAuth auth = plugin.database.getAuth(playerQueryFinal.toLowerCase());
if (auth == null) {
m.send(sender, MessageKey.UNKNOWN_USER);
return;
}
StringBuilder message = new StringBuilder("[AuthMe] ");
List<String> accountList = plugin.database.getAllAuthsByName(auth);
if (accountList == null || accountList.isEmpty()) {
if (accountList.isEmpty()) {
m.send(sender, MessageKey.USER_NOT_REGISTERED);
return;
}
@@ -61,28 +53,20 @@ public class AccountsCommand extends ExecutableCommand {
message.append('.');
}
}
sender.sendMessage("[AuthMe] " + playerQueryFinal + " has " + String.valueOf(accountList.size()) + " accounts");
sender.sendMessage("[AuthMe] " + playerQueryFinal + " has "
+ String.valueOf(accountList.size()) + " accounts.");
sender.sendMessage(message.toString());
}
});
return;
} else {
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override
public void run() {
List<String> accountList;
try {
accountList = plugin.database.getAllAuthsByIp(playerQueryFinal);
} catch (Exception e) {
ConsoleLogger.showError(e.getMessage());
ConsoleLogger.writeStackTrace(e);
m.send(sender, MessageKey.ERROR);
return;
}
List<String> accountList = plugin.database.getAllAuthsByIp(playerQueryFinal);
StringBuilder message = new StringBuilder("[AuthMe] ");
if (accountList == null || accountList.isEmpty()) {
sender.sendMessage("[AuthMe] This IP does not exist in the database");
if (accountList.isEmpty()) {
sender.sendMessage("[AuthMe] This IP does not exist in the database.");
return;
}
if (accountList.size() == 1) {
@@ -99,7 +83,8 @@ public class AccountsCommand extends ExecutableCommand {
message.append('.');
}
}
sender.sendMessage("[AuthMe] " + playerQueryFinal + " has " + String.valueOf(accountList.size()) + " accounts");
sender.sendMessage("[AuthMe] " + playerQueryFinal + " has "
+ String.valueOf(accountList.size()) + " accounts.");
sender.sendMessage(message.toString());
}
});
src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
+30 -22
View File
@@ -16,14 +16,14 @@ public class SetEmailCommand extends ExecutableCommand {
@Override
public void executeCommand(CommandSender sender, List<String> arguments) {
// AuthMe plugin instance
AuthMe plugin = AuthMe.getInstance();
final AuthMe plugin = AuthMe.getInstance();
// Messages instance
Messages m = plugin.getMessages();
final Messages m = plugin.getMessages();
// Get the player name and email address
String playerName = arguments.get(0);
String playerEmail = arguments.get(1);
final String playerName = arguments.get(0);
final String playerEmail = arguments.get(1);
// Validate the email address
if (!Settings.isEmailCorrect(playerEmail)) {
@@ -31,26 +31,34 @@ public class SetEmailCommand extends ExecutableCommand {
return;
}
// Validate the user
PlayerAuth auth = plugin.database.getAuth(playerName.toLowerCase());
if (auth == null) {
m.send(sender, MessageKey.UNKNOWN_USER);
return;
}
plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override
public void run() {
// Validate the user
PlayerAuth auth = plugin.database.getAuth(playerName);
if (auth == null) {
m.send(sender, MessageKey.UNKNOWN_USER);
return;
}
// Set the email address
auth.setEmail(playerEmail);
if (!plugin.database.updateEmail(auth)) {
m.send(sender, MessageKey.ERROR);
return;
}
// Set the email address
// Update the player cache
if (PlayerCache.getInstance().getAuth(playerName.toLowerCase()) != null)
PlayerCache.getInstance().updatePlayer(auth);
auth.setEmail(playerEmail);
if (!plugin.database.updateEmail(auth)) {
m.send(sender, MessageKey.ERROR);
return;
}
// Show a status message
m.send(sender, MessageKey.EMAIL_CHANGED_SUCCESS);
return;
// Update the player cache
if (PlayerCache.getInstance().getAuth(playerName) != null) {
PlayerCache.getInstance().updatePlayer(auth);
}
// Show a status message
m.send(sender, MessageKey.EMAIL_CHANGED_SUCCESS);
}
});
return true;
}
}