Altitude/PlayerUtils
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Glow command to optimize logic order.

Browse Source 
Reorganized the "off" condition block to execute after clearing existing glow teams.
This commit is contained in:
Teriuihi 2025-03-24 21:26:56 +01:00
parent 7cfdc39f75
commit 785a64b7e6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Glow.java
View File

@ -41,17 +41,17 @@ public class Glow extends SubCommand {
Player player = playerFromArg.get(); Player player = playerFromArg.get();
if (args[1].equalsIgnoreCase("off")) {
turnOffGlow(commandSender, player, otherPlayer);
return true;
}
Scoreboard board = Bukkit.getScoreboardManager().getMainScoreboard(); Scoreboard board = Bukkit.getScoreboardManager().getMainScoreboard();
board.getTeams().stream() board.getTeams().stream()
.filter(team -> team.getName().startsWith("Glow")) .filter(team -> team.getName().startsWith("Glow"))
.filter(team -> team.hasPlayer(player)) .filter(team -> team.hasPlayer(player))
.forEach(team -> team.removePlayer(player)); .forEach(team -> team.removePlayer(player));
if (args[1].equalsIgnoreCase("off")) {
turnOffGlow(commandSender, player, otherPlayer);
return true;
}
Optional<DyeColor> any = Arrays.stream(DyeColor.values()).filter(chatColor -> chatColor.name().equalsIgnoreCase(args[1])).findAny(); Optional<DyeColor> any = Arrays.stream(DyeColor.values()).filter(chatColor -> chatColor.name().equalsIgnoreCase(args[1])).findAny();
if (any.isEmpty()) { if (any.isEmpty()) {
commandSender.sendRichMessage(getHelpMessage()); commandSender.sendRichMessage(getHelpMessage());
@ -97,6 +97,7 @@ public class Glow extends SubCommand {
private void turnOffGlow(CommandSender commandSender, Player player, boolean otherPlayer) { private void turnOffGlow(CommandSender commandSender, Player player, boolean otherPlayer) {
player.sendRichMessage(Messages.GLOW.GLOW_OFF); player.sendRichMessage(Messages.GLOW.GLOW_OFF);
player.setGlowing(false); player.setGlowing(false);
if (otherPlayer) { if (otherPlayer) {
commandSender.sendRichMessage(Messages.GLOW.GLOW_OFF_FOR_PLAYER, Placeholder.component("player", player.name())); commandSender.sendRichMessage(Messages.GLOW.GLOW_OFF_FOR_PLAYER, Placeholder.component("player", player.name()));
} }