Skip to content

Commit f3f290a

Browse files
committed
feat(bedwars): show username to self
1 parent 7ce1ac2 commit f3f290a

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/events/ActionPlayerChat.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.swofty.commons.bedwars.BedwarsLevelUtil;
77
import net.swofty.type.bedwarsgame.TypeBedWarsGameLoader;
88
import net.swofty.type.bedwarsgame.game.Game;
9+
import net.swofty.type.bedwarsgame.game.GameStatus;
910
import net.swofty.type.bedwarsgame.user.BedWarsPlayer;
1011
import net.swofty.type.generic.data.datapoints.DatapointChatType;
1112
import net.swofty.type.generic.data.datapoints.DatapointLeaderboardLong;
@@ -55,6 +56,15 @@ public void run(PlayerChatEvent event) {
5556
return;
5657
}
5758

59+
if (game.getGameStatus() == GameStatus.WAITING) {
60+
String textColor = rank.equals(Rank.DEFAULT) ? "§7" : "§f";
61+
62+
game.getPlayers().forEach(onlinePlayer -> {
63+
onlinePlayer.sendMessage(rank.getPrefix() + player.getUsername() + textColor + ": " + finalMessage);
64+
});
65+
return;
66+
}
67+
5868
List<BedWarsPlayer> receivers;
5969
if (game.getBedwarsGameType() == BedwarsGameType.SOLO) {
6070
receivers = game.getPlayers();

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/Game.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,10 @@ public void join(BedWarsPlayer player) {
108108
String randomLetters = UUID.randomUUID().toString().replaceAll("-", "")
109109
.substring(0, new Random().nextInt(10) + 4);
110110
for (BedWarsPlayer p : players) {
111-
p.sendMessage("§k" + randomLetters + " §ehas joined (§b" + players.size() + "§e/§b" + maxPlayers + "§e)");
111+
String name = p == player ? player.getUsername() : randomLetters;
112+
p.sendMessage("§k" + name + " §ehas joined (§b" + players.size() + "§e/§b" + maxPlayers + "§e)");
112113
}
114+
player.setDisplayName(Component.text(randomLetters));
113115

114116
if (hasMinimumPlayersForStart() && !countdown.isActive()) {
115117
countdown.startCountdown();

0 commit comments

Comments
 (0)