Fix behaviour of /list when showing real names (#3858)

triagonal · web-flow · commit b84aaa1dabda · 2020-12-31T19:14:39.000-05:00
diff --git a/Essentials/src/main/java/com/earth2me/essentials/PlayerList.java b/Essentials/src/main/java/com/earth2me/essentials/PlayerList.java
@@ -37,7 +37,9 @@ public static String listUsers(final IEssentials ess, final List<User> users, fi
             }
             user.setDisplayNick();
             groupString.append(user.getDisplayName());
-            if (ess.getSettings().realNamesOnList() && !ChatColor.stripColor(user.getDisplayName()).equals(user.getName())) {
+
+            final String strippedNick = FormatUtil.stripFormat(user.getNickname());
+            if (ess.getSettings().realNamesOnList() && strippedNick != null && !strippedNick.equals(user.getName())) {
                 groupString.append(" (").append(user.getName()).append(")");
             }
             groupString.append(ChatColor.WHITE.toString());

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ public static String listUsers(final IEssentials ess, final List<User> users, fi`
`37`	`37`	`}`
`38`	`38`	`user.setDisplayNick();`
`39`	`39`	`groupString.append(user.getDisplayName());`
`40`		`- if (ess.getSettings().realNamesOnList() && !ChatColor.stripColor(user.getDisplayName()).equals(user.getName())) {`
	`40`	`+`
	`41`	`+ final String strippedNick = FormatUtil.stripFormat(user.getNickname());`
	`42`	`+ if (ess.getSettings().realNamesOnList() && strippedNick != null && !strippedNick.equals(user.getName())) {`
`41`	`43`	`groupString.append(" (").append(user.getName()).append(")");`
`42`	`44`	`}`
`43`	`45`	`groupString.append(ChatColor.WHITE.toString());`