Use guard clauses when possible

Closes #322
This commit is contained in:
kaboom 2022-10-16 03:08:32 +03:00
parent 29207ef8b9
commit 1a0c094f4a
14 changed files with 233 additions and 205 deletions

View file

@ -24,45 +24,48 @@ public final class CommandUsername implements CommandExecutor {
if (sender instanceof ConsoleCommandSender) {
sender.sendMessage(Component
.text("Command has to be run by a player"));
} else {
final Player player = (Player) sender;
final String nameColor = ChatColor.translateAlternateColorCodes(
'&', String.join(" ", args));
final String name = nameColor.substring(0, Math.min(16, nameColor.length()));
final long millisDifference = System.currentTimeMillis() - millis;
if (args.length == 0) {
player.sendMessage(Component
.text("Usage: /" + label + " <username>",
NamedTextColor.RED));
} else if (name.equals(player.getName())) {
player.sendMessage(Component
.text("You already have the username \"" + name + "\""));
} else if (millisDifference <= 2000) {
player.sendMessage(Component
.text("Please wait a few seconds before changing your username."));
} else {
if (Bukkit.getPlayer(name) != null) {
player.sendMessage(Component
.text("A player with that username is already logged in."));
return true;
}
final PlayerProfile profile = player.getPlayerProfile();
//FIXME Marked for removal
profile.setName(name);
player.setPlayerProfile(profile);
millis = System.currentTimeMillis();
player.sendMessage(Component
.text("Successfully set your username to \"" + name + "\""));
}
return true;
}
final Player player = (Player) sender;
final String nameColor = ChatColor.translateAlternateColorCodes(
'&', String.join(" ", args));
final String name = nameColor.substring(0, Math.min(16, nameColor.length()));
final long millisDifference = System.currentTimeMillis() - millis;
if (args.length == 0) {
player.sendMessage(Component
.text("Usage: /" + label + " <username>",
NamedTextColor.RED));
return true;
}
if (name.equals(player.getName())) {
player.sendMessage(Component
.text("You already have the username \"" + name + "\""));
return true;
}
if (millisDifference <= 2000) {
player.sendMessage(Component
.text("Please wait a few seconds before changing your username."));
return true;
}
if (Bukkit.getPlayer(name) != null) {
player.sendMessage(Component
.text("A player with that username is already logged in."));
return true;
}
final PlayerProfile profile = player.getPlayerProfile();
profile.setName(name); // FIXME: Marked for removal
player.setPlayerProfile(profile);
millis = System.currentTimeMillis();
player.sendMessage(Component
.text("Successfully set your username to \"" + name + "\""));
return true;
}
}