From 65abbc16463cb11a9916bca0a5fc73223e4238d3 Mon Sep 17 00:00:00 2001
From: Boy0000 <sivertpaulsen2@gmail.com>
Date: Sat, 3 Feb 2024 13:03:38 +0100
Subject: [PATCH] fix: let LuckPerms-Meta placeholder pass if Proxy returns
 blank (#153)

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

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

* refactor: remove unnecessary sorting warning
---
 .../java/net/william278/velocitab/config/Placeholder.java   | 6 +++---
 .../net/william278/velocitab/sorting/SortingManager.java    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/william278/velocitab/config/Placeholder.java b/src/main/java/net/william278/velocitab/config/Placeholder.java
index e122a70..a7b2b18 100644
--- a/src/main/java/net/william278/velocitab/config/Placeholder.java
+++ b/src/main/java/net/william278/velocitab/config/Placeholder.java
@@ -51,8 +51,8 @@ public enum Placeholder {
     USERNAME_LOWER((plugin, player) -> player.getCustomName().orElse(player.getPlayer().getUsername()).toLowerCase()),
     SERVER((plugin, player) -> player.getServerDisplayName(plugin)),
     PING((plugin, player) -> Long.toString(player.getPlayer().getPing())),
-    PREFIX((plugin, player) -> player.getRole().getPrefix().orElse("")),
-    SUFFIX((plugin, player) -> player.getRole().getSuffix().orElse("")),
+    PREFIX((plugin, player) -> player.getRole().getPrefix().orElse("%luckperms_prefix%")),
+    SUFFIX((plugin, player) -> player.getRole().getSuffix().orElse("%luckperms_suffix%")),
     ROLE((plugin, player) -> player.getRole().getName().orElse("")),
     ROLE_DISPLAY_NAME((plugin, player) -> player.getRole().getDisplayName().orElse("")),
     ROLE_WEIGHT((plugin, player) -> player.getRoleWeightString()),
@@ -61,7 +61,7 @@ public enum Placeholder {
     DEBUG_TEAM_NAME((plugin, player) -> plugin.getFormatter().escape(player.getLastTeamName().orElse(""))),
     LUCKPERMS_META_((param, plugin, player) -> plugin.getLuckPermsHook()
             .map(hook -> hook.getMeta(player.getPlayer(), param))
-            .orElse(""));
+            .orElse("%luckperms_meta_" + param + "%"));
 
     /**
      * Function to replace placeholders with a real value
diff --git a/src/main/java/net/william278/velocitab/sorting/SortingManager.java b/src/main/java/net/william278/velocitab/sorting/SortingManager.java
index ee0d581..fc3f12f 100644
--- a/src/main/java/net/william278/velocitab/sorting/SortingManager.java
+++ b/src/main/java/net/william278/velocitab/sorting/SortingManager.java
@@ -58,7 +58,6 @@ public class SortingManager {
 
         if (result.length() > 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