Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.swofty.commons.bedwars.BedwarsLevelUtil;
import net.swofty.type.bedwarsgame.TypeBedWarsGameLoader;
import net.swofty.type.bedwarsgame.game.Game;
import net.swofty.type.bedwarsgame.game.GameStatus;
import net.swofty.type.bedwarsgame.user.BedWarsPlayer;
import net.swofty.type.generic.data.datapoints.DatapointChatType;
import net.swofty.type.generic.data.datapoints.DatapointLeaderboardLong;
Expand Down Expand Up @@ -55,6 +56,15 @@ public void run(PlayerChatEvent event) {
return;
}

if (game.getGameStatus() == GameStatus.WAITING) {
String textColor = rank.equals(Rank.DEFAULT) ? "§7" : "§f";

game.getPlayers().forEach(onlinePlayer -> {
onlinePlayer.sendMessage(rank.getPrefix() + player.getUsername() + textColor + ": " + finalMessage);
});
return;
}

List<BedWarsPlayer> receivers;
if (game.getBedwarsGameType() == BedwarsGameType.SOLO) {
receivers = game.getPlayers();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ public void join(BedWarsPlayer player) {
String randomLetters = UUID.randomUUID().toString().replaceAll("-", "")
.substring(0, new Random().nextInt(10) + 4);
for (BedWarsPlayer p : players) {
p.sendMessage("§k" + randomLetters + " §ehas joined (§b" + players.size() + "§e/§b" + maxPlayers + "§e)");
String name = p == player ? player.getUsername() : randomLetters;
p.sendMessage("§k" + name + " §ehas joined (§b" + players.size() + "§e/§b" + maxPlayers + "§e)");
}
player.setDisplayName(Component.text(randomLetters));

if (hasMinimumPlayersForStart() && !countdown.isActive()) {
countdown.startCountdown();
Expand Down