From f3f290a791fd2aa69b0ce9155ea148c1a1ece1ea Mon Sep 17 00:00:00 2001
From: ArikSquad <75741608+ArikSquad@users.noreply.github.com>
Date: Tue, 30 Dec 2025 20:42:44 +0200
Subject: [PATCH] feat(bedwars): show username to self

---
 .../type/bedwarsgame/events/ActionPlayerChat.java      | 10 ++++++++++
 .../java/net/swofty/type/bedwarsgame/game/Game.java    |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/events/ActionPlayerChat.java b/type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/events/ActionPlayerChat.java
index aa5277496..df531928e 100644
--- a/type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/events/ActionPlayerChat.java
+++ b/type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/events/ActionPlayerChat.java
@@ -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;
@@ -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();
diff --git a/type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/Game.java b/type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/Game.java
index 83531be87..078d9f169 100644
--- a/type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/Game.java
+++ b/type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/Game.java
@@ -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();