From cc635ca8c6a0ddcdd87f74c7acb1c8290646f762 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Sat, 22 Mar 2025 15:39:02 +0700 Subject: [PATCH] refactor: fix FindAltsCommand (again) but also attempt to make it more readable --- build-number.txt | 2 +- .../chomens_bot/commands/FindAltsCommand.java | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/build-number.txt b/build-number.txt index 6fc392cb..74fae4f4 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -2073 \ No newline at end of file +2075 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java index 6ba6b630..6d40ac5c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java @@ -39,10 +39,19 @@ public class FindAltsCommand extends Command { final boolean allServer = flag.equals("-allserver"); - // ohio code - String player = !allServer ? flag : ""; // adds the first argument if no flag - final String restPlayer = context.getString(true, false); - if (!restPlayer.isEmpty()) player += " " + restPlayer; + String player; + + if (allServer) { + player = context.getString(true, true); + } else { + final String rest = context.getString(true, false); + player = flag + + ( + rest.isEmpty() ? + "" : + " " + rest + ); + } final PlayerEntry playerEntry = bot.players.getEntry(player);