slightly optimize width calculation & partially avoid #347

NEZNAMY · Dec 4, 2021 · c222061 · c222061
1 parent acdd994
commit c222061
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/shared/src/main/java/me/neznamy/tab/shared/features/AlignedPlayerList.java b/shared/src/main/java/me/neznamy/tab/shared/features/AlignedPlayerList.java
@@ -59,20 +59,17 @@ public String formatNameAndUpdateLeader(TabPlayer player, TabPlayer viewer) {
 	}
 
 	public String formatName(String prefixAndName, String suffix) {
+		if (suffix.length() == 0) return prefixAndName;
 		int playerNameWidth = getTextWidth(IChatBaseComponent.fromColoredText(prefixAndName + suffix));
-		StringBuilder newFormat = new StringBuilder(prefixAndName);
-		newFormat.append(EnumChatFormat.COLOR_CHAR);
-		newFormat.append("r");
+		StringBuilder newFormat = new StringBuilder(prefixAndName).append(EnumChatFormat.RESET.getFormat());
 		try {
 			newFormat.append(buildSpaces(maxWidth + 12 - playerNameWidth));
 		} catch (IllegalArgumentException e) {
 			//will investigate later
 			newFormat.append(buildSpaces(12));
 			TAB.getInstance().getErrorManager().printError("Could not build space consisting of " + (maxWidth + 12 - playerNameWidth) + " pixels", e);
 		}
-		newFormat.append(EnumChatFormat.getLastColors(prefixAndName));
-		newFormat.append(suffix);
-		return newFormat.toString();
+		return newFormat.append(EnumChatFormat.getLastColors(prefixAndName)).append(suffix).toString();
 	}
 
 	/**