Run DisplayNameListener regex on seperate thread

GufliMC · Aug 5, 2024 · 981de6f · 981de6f
1 parent 85afa00
commit 981de6f
Showing 1 changed file with 28 additions and 21 deletions.
diff --git a/bukkit/src/main/java/com/gufli/kingdomcraft/bukkit/listeners/DisplayNameListener.java b/bukkit/src/main/java/com/gufli/kingdomcraft/bukkit/listeners/DisplayNameListener.java
@@ -24,6 +24,8 @@
 import com.gufli.kingdomcraft.api.events.UserLeaveKingdomEvent;
 import com.gufli.kingdomcraft.bukkit.KingdomCraftBukkitPlugin;
 import com.gufli.kingdomcraft.bukkit.entity.BukkitPlayer;
+
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 public class DisplayNameListener {
@@ -63,27 +65,32 @@ private void update(PlatformPlayer pp) {
             return;
         }
 
-        String prefix = plugin.getKdc().getPlaceholderManager().handle(pp, "{kingdom_prefix}");
-        if ( !prefix.equals("") && !plugin.decolorify(prefix).endsWith(" ")) {
-            prefix += " ";
-        }
-
-        String suffix = plugin.getKdc().getPlaceholderManager().handle(pp, "{kingdom_suffix}");
-        if ( !suffix.equals("") && !plugin.decolorify(suffix).startsWith(" ")) {
-            suffix = " " + suffix;
-        }
-
-        Player player = ((BukkitPlayer) pp).getPlayer();
-
-        if ( prefix.equals("") && suffix.equals("") ) {
-            player.setDisplayName(player.getName());
-            return;
-        }
-
-        prefix = plugin.colorify(prefix);
-        suffix = plugin.colorify(suffix);
-
-        player.setDisplayName(prefix + player.getName() + suffix);
+        plugin.getScheduler().executeAsync(() -> {
+            String prefix = plugin.getKdc().getPlaceholderManager().handle(pp, "{kingdom_prefix}");
+            if ( !prefix.equals("") && !plugin.decolorify(prefix).endsWith(" ")) {
+                prefix += " ";
+            }
+
+            String suffix = plugin.getKdc().getPlaceholderManager().handle(pp, "{kingdom_suffix}");
+            if ( !suffix.equals("") && !plugin.decolorify(suffix).startsWith(" ")) {
+                suffix = " " + suffix;
+            }
+
+            String prefixFinal = plugin.colorify(prefix);
+            String suffixFinal = plugin.colorify(suffix);
+
+            plugin.getScheduler().executeSync(() -> {
+                Player player = ((BukkitPlayer) pp).getPlayer();
+
+                if (prefixFinal.equals("") && suffixFinal.equals("")) {
+                    player.setDisplayName(player.getName());
+                    return;
+                }
+
+                player.setDisplayName(prefixFinal + player.getName() + suffixFinal);
+            });
+
+        });
     }
 
 }