Fixed a bug about the names of the players not being colorized after …

…the user logs off and in.
zDevelopers · Jul 19, 2014 · ce4bcd7 · ce4bcd7
1 parent 689c748
commit ce4bcd7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/src/main/java/me/azenet/UHPlugin/UHPluginListener.java b/src/main/java/me/azenet/UHPlugin/UHPluginListener.java
@@ -177,8 +177,12 @@ public void onPlayerJoin(final PlayerJoinEvent ev) {
 			p.getGameManager().getScoreboardManager().updateHealthScore(ev.getPlayer());
 		}
 
+		// Mainly useful on the first join.
 		p.getGameManager().getScoreboardManager().setScoreboardForPlayer(ev.getPlayer());
 
+		// The display name is reset when the player log off.
+		p.getTeamManager().colorizePlayer(ev.getPlayer());
+
 		// A warning to the administrators if WorldBorder is not present.
 		if(ev.getPlayer().hasPermission("uh.*") && !p.getWorldBorderIntegration().isWBIntegrationEnabled()) {
 			ev.getPlayer().sendMessage(ChatColor.RED + "WorldBorder is not installed, you should use it with the Ultra Hardcore plugin.");

diff --git a/src/main/java/me/azenet/UHPlugin/UHTeam.java b/src/main/java/me/azenet/UHPlugin/UHTeam.java
@@ -48,19 +48,15 @@ public void addPlayer(Player player) {
 		players.add(player);
 		plugin.getGameManager().getScoreboardManager().getScoreboard().getTeam(this.name).addPlayer(player);
 
-		if(plugin.getConfig().getBoolean("colorizeChat")) {
-			player.setDisplayName(this.color + player.getName() + ChatColor.RESET);
-		}
+		plugin.getTeamManager().colorizePlayer(player);
 	}
 
 	public void removePlayer(Player player) {
 		updatePlayerObjects();
 		players.remove(player);
 		plugin.getGameManager().getScoreboardManager().getScoreboard().getTeam(this.name).removePlayer(player);
 
-		if(plugin.getConfig().getBoolean("colorizeChat")) {
-			player.setDisplayName(ChatColor.WHITE + player.getName() + ChatColor.RESET);
-		}
+		plugin.getTeamManager().colorizePlayer(player);
 	}
 
 	public void deleteTeam() {

diff --git a/src/main/java/me/azenet/UHPlugin/UHTeamManager.java b/src/main/java/me/azenet/UHPlugin/UHTeamManager.java
@@ -92,6 +92,26 @@ public void reset() {
 		teams = new ArrayList<UHTeam>();
 	}
 
+	/**
+	 * Sets the correct display name of a player, according to his team.
+	 * 
+	 * @param player
+	 */
+	public void colorizePlayer(Player player) {
+		if(!p.getConfig().getBoolean("colorizeChat")) {
+			return;
+		}
+
+		UHTeam team = getTeamForPlayer(player);
+
+		if(team == null) {
+			player.setDisplayName(ChatColor.WHITE + player.getName() + ChatColor.RESET);
+		}
+		else {
+			player.setDisplayName(team.getChatColor() + player.getName() + ChatColor.RESET);
+		}
+	}
+
 	/**
 	 * Returns all the teams.
 	 *