Trivial code householding

- Replace `if (!x) ... else ...` with `if(x) ... else ...`
- Avoid throwing RuntimeException; use children
This commit is contained in:
ljacqu
2016-05-30 12:18:55 +02:00
parent 9349993faf
commit 9b1ee86b2f
19 changed files with 77 additions and 82 deletions
@@ -29,7 +29,21 @@ public class AccountsCommand implements ExecutableCommand {
final String playerName = arguments.isEmpty() ? sender.getName() : arguments.get(0);
// Assumption: a player name cannot contain '.'
if (!playerName.contains(".")) {
if (playerName.contains(".")) {
bukkitService.runTaskAsynchronously(new Runnable() {
@Override
public void run() {
List<String> accountList = dataSource.getAllAuthsByIp(playerName);
if (accountList.isEmpty()) {
sender.sendMessage("[AuthMe] This IP does not exist in the database.");
} else if (accountList.size() == 1) {
sender.sendMessage("[AuthMe] " + playerName + " is a single account player");
} else {
outputAccountsList(sender, playerName, accountList);
}
}
});
} else {
bukkitService.runTaskAsynchronously(new Runnable() {
@Override
public void run() {
@@ -49,20 +63,6 @@ public class AccountsCommand implements ExecutableCommand {
}
}
});
} else {
bukkitService.runTaskAsynchronously(new Runnable() {
@Override
public void run() {
List<String> accountList = dataSource.getAllAuthsByIp(playerName);
if (accountList.isEmpty()) {
sender.sendMessage("[AuthMe] This IP does not exist in the database.");
} else if (accountList.size() == 1) {
sender.sendMessage("[AuthMe] " + playerName + " is a single account player");
} else {
outputAccountsList(sender, playerName, accountList);
}
}
});
}
}
@@ -66,11 +66,11 @@ public class ChangePasswordAdminCommand implements ExecutableCommand {
HashedPassword hashedPassword = passwordSecurity.computeHash(playerPass, playerNameLowerCase);
auth.setPassword(hashedPassword);
if (!dataSource.updatePassword(auth)) {
commandService.send(sender, MessageKey.ERROR);
} else {
if (dataSource.updatePassword(auth)) {
commandService.send(sender, MessageKey.PASSWORD_CHANGED_SUCCESS);
ConsoleLogger.info(playerNameLowerCase + "'s password changed");
} else {
commandService.send(sender, MessageKey.ERROR);
}
}
@@ -18,10 +18,10 @@ public class FirstSpawnCommand extends PlayerCommand {
@Override
public void runCommand(Player player, List<String> arguments, CommandService commandService) {
if (spawnLoader.getFirstSpawn() != null) {
player.teleport(spawnLoader.getFirstSpawn());
} else {
if (spawnLoader.getFirstSpawn() == null) {
player.sendMessage("[AuthMe] First spawn has failed, please try to define the first spawn");
} else {
player.teleport(spawnLoader.getFirstSpawn());
}
}
}
@@ -15,10 +15,10 @@ public class SpawnCommand extends PlayerCommand {
@Override
public void runCommand(Player player, List<String> arguments, CommandService commandService) {
if (spawnLoader.getSpawn() != null) {
player.teleport(spawnLoader.getSpawn());
} else {
if (spawnLoader.getSpawn() == null) {
player.sendMessage("[AuthMe] Spawn has failed, please try to define the spawn");
} else {
player.teleport(spawnLoader.getSpawn());
}
}
}