Fork/Velocitab
2
0
Fork 0
forked from Upstream/Velocitab
Code Pull Requests Actions Releases Activity

Fix player names with underscores having formatting applied (#10)

Browse Source
This commit is contained in:
ironboundred 2023-02-28 18:51:43 -06:00 committed by GitHub
parent 10e02233f3
commit 80bb9ab627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/william278/velocitab/config/Placeholder.java
View File

@ -21,13 +21,13 @@ public enum Placeholder {
.orElse("")), .orElse("")),
CURRENT_DATE((plugin, player) -> DateTimeFormatter.ofPattern("dd MMM yyyy").format(LocalDateTime.now())), CURRENT_DATE((plugin, player) -> DateTimeFormatter.ofPattern("dd MMM yyyy").format(LocalDateTime.now())),
CURRENT_TIME((plugin, player) -> DateTimeFormatter.ofPattern("HH:mm:ss").format(LocalDateTime.now())), CURRENT_TIME((plugin, player) -> DateTimeFormatter.ofPattern("HH:mm:ss").format(LocalDateTime.now())),
USERNAME((plugin, player) -> player.getPlayer().getUsername()), USERNAME((plugin, player) -> escape(player.getPlayer().getUsername())),
SERVER((plugin, player) -> player.getServerName()), SERVER((plugin, player) -> player.getServerName()),
PING((plugin, player) -> Long.toString(player.getPlayer().getPing())), PING((plugin, player) -> Long.toString(player.getPlayer().getPing())),
PREFIX((plugin, player) -> player.getRole().getPrefix().orElse("")), PREFIX((plugin, player) -> player.getRole().getPrefix().orElse("")),
SUFFIX((plugin, player) -> player.getRole().getSuffix().orElse("")), SUFFIX((plugin, player) -> player.getRole().getSuffix().orElse("")),
ROLE((plugin, player) -> player.getRole().getName().orElse("")), ROLE((plugin, player) -> player.getRole().getName().orElse("")),
DEBUG_TEAM_NAME((plugin, player) -> player.getTeamName()); DEBUG_TEAM_NAME((plugin, player) -> escape(player.getTeamName()));
private final BiFunction<Velocitab, TabPlayer, String> formatter; private final BiFunction<Velocitab, TabPlayer, String> formatter;
@ -40,7 +40,12 @@ public enum Placeholder {
for (Placeholder placeholder : values()) { for (Placeholder placeholder : values()) {
format = format.replace("%" + placeholder.name().toLowerCase() + "%", placeholder.formatter.apply(plugin, player)); format = format.replace("%" + placeholder.name().toLowerCase() + "%", placeholder.formatter.apply(plugin, player));
} }
return format; return format;
} }
private static String escape(String replace) {
// Replace __ so that it is not seen as underline when the string is formatted.
return replace.replace("__", "_\\_");
}
} }