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

fix: let LuckPerms-Meta placeholder pass if Proxy returns blank (#153)

Browse Source 
* fix: let LuckPerms-Meta placeholder pass if Proxy returns blank

* fix: let unset prefix & suffix also pass to bridge

* refactor: remove unnecessary sorting warning
This commit is contained in:
Boy0000 2024-02-03 13:03:38 +01:00 committed by GitHub
parent 7caa185fc1
commit 65abbc1646
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,8 +51,8 @@ public enum Placeholder {
USERNAME_LOWER((plugin, player) -> player.getCustomName().orElse(player.getPlayer().getUsername()).toLowerCase()), USERNAME_LOWER((plugin, player) -> player.getCustomName().orElse(player.getPlayer().getUsername()).toLowerCase()),
SERVER((plugin, player) -> player.getServerDisplayName(plugin)), SERVER((plugin, player) -> player.getServerDisplayName(plugin)),
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("%luckperms_prefix%")),
SUFFIX((plugin, player) -> player.getRole().getSuffix().orElse("")), SUFFIX((plugin, player) -> player.getRole().getSuffix().orElse("%luckperms_suffix%")),
ROLE((plugin, player) -> player.getRole().getName().orElse("")), ROLE((plugin, player) -> player.getRole().getName().orElse("")),
ROLE_DISPLAY_NAME((plugin, player) -> player.getRole().getDisplayName().orElse("")), ROLE_DISPLAY_NAME((plugin, player) -> player.getRole().getDisplayName().orElse("")),
ROLE_WEIGHT((plugin, player) -> player.getRoleWeightString()), ROLE_WEIGHT((plugin, player) -> player.getRoleWeightString()),
@ -61,7 +61,7 @@ public enum Placeholder {
DEBUG_TEAM_NAME((plugin, player) -> plugin.getFormatter().escape(player.getLastTeamName().orElse(""))), DEBUG_TEAM_NAME((plugin, player) -> plugin.getFormatter().escape(player.getLastTeamName().orElse(""))),
LUCKPERMS_META_((param, plugin, player) -> plugin.getLuckPermsHook() LUCKPERMS_META_((param, plugin, player) -> plugin.getLuckPermsHook()
.map(hook -> hook.getMeta(player.getPlayer(), param)) .map(hook -> hook.getMeta(player.getPlayer(), param))
.orElse("")); .orElse("%luckperms_meta_" + param + "%"));
/** /**
* Function to replace placeholders with a real value * Function to replace placeholders with a real value

1
src/main/java/net/william278/velocitab/sorting/SortingManager.java
View File

@ -58,7 +58,6 @@ public class SortingManager {
if (result.length() > 12) { if (result.length() > 12) {
result = result.substring(0, 12); result = result.substring(0, 12);
plugin.log(Level.WARN, "Sorting element list is too long, truncating to 16 characters");
} }
result += player.getPlayer().getUniqueId().toString().substring(0, 4); // Make unique result += player.getPlayer().getUniqueId().toString().substring(0, 4); // Make unique