From c2220615290bc089952493e28a2de3064b9f5eae Mon Sep 17 00:00:00 2001 From: NEZNAMY Date: Sat, 4 Dec 2021 19:15:36 +0100 Subject: [PATCH] slightly optimize width calculation & partially avoid #347 --- .../neznamy/tab/shared/features/AlignedPlayerList.java | 9 +++------ 1 file changed, 3 insertions(+), 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 index e3ff6d43c..14e0f6528 100644 --- 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,10 +59,9 @@ 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) { @@ -70,9 +69,7 @@ public String formatName(String prefixAndName, String suffix) { 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(); } /**