From c05b7a3acd5cb610a9754cccc6631c0158273da1 Mon Sep 17 00:00:00 2001 From: Eudald Cardona Date: Sun, 10 Jan 2021 00:52:57 +0100 Subject: [PATCH 1/2] Add /tm status command Signed-off-by: Eudald Cardona --- .../dev/pgm/events/ready/ReadyCommands.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/dev/pgm/events/ready/ReadyCommands.java b/src/main/java/dev/pgm/events/ready/ReadyCommands.java index 9a96637..098c65f 100644 --- a/src/main/java/dev/pgm/events/ready/ReadyCommands.java +++ b/src/main/java/dev/pgm/events/ready/ReadyCommands.java @@ -2,6 +2,7 @@ import dev.pgm.events.config.AppData; import java.time.Duration; +import java.util.stream.Stream; import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -78,6 +79,25 @@ public void unreadyCommand(CommandSender sender, Match match, MatchPlayer player } } + @Command(aliases = "status", desc = "Display if teams are ready") + public void status(CommandSender sender, Match match) { + Stream parties = match.getCompetitors().stream(); + if (AppData.observersMustReady()) + parties = Stream.concat(Stream.of(match.getDefaultParty()), parties); + + parties + .map( + p -> + p.getColor() + + p.getNameLegacy() + + ChatColor.RESET + + " is " + + (readyParties.isReady(p) + ? ChatColor.GREEN + "ready" + : ChatColor.RED + "not ready")) + .forEach(sender::sendMessage); + } + private boolean preConditions(Match match) { return !match.isRunning() && !match.isFinished(); } From b5e62d4973558c5c3dd2eaf7e4b0c5522a8379a8 Mon Sep 17 00:00:00 2001 From: Eudald Cardona Date: Sun, 10 Jan 2021 10:46:47 +0100 Subject: [PATCH 2/2] Change /tm ready/unready formatting to match /tm status Signed-off-by: Eudald Cardona --- src/main/java/dev/pgm/events/ready/ReadyCommands.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/pgm/events/ready/ReadyCommands.java b/src/main/java/dev/pgm/events/ready/ReadyCommands.java index 098c65f..5a4f2fd 100644 --- a/src/main/java/dev/pgm/events/ready/ReadyCommands.java +++ b/src/main/java/dev/pgm/events/ready/ReadyCommands.java @@ -39,7 +39,12 @@ public void readyCommand(CommandSender sender, Match match, MatchPlayer player) Party party = player.getParty(); Bukkit.broadcastMessage( - party.getColor() + player.getParty().getNameLegacy() + ChatColor.RESET + " is now ready."); + party.getColor() + + player.getParty().getNameLegacy() + + ChatColor.RESET + + " is " + + ChatColor.GREEN + + "now ready"); readyParties.ready(party); if (readyParties.allReady(match)) @@ -66,7 +71,9 @@ public void unreadyCommand(CommandSender sender, Match match, MatchPlayer player party.getColor() + player.getParty().getNameLegacy() + ChatColor.RESET - + " is now unready."); + + " is " + + ChatColor.RED + + "no longer ready"); if (readyParties.allReady(match)) { readyParties.unReady(party);