fix(papi): use offline player for placeholders

sVoxelDev · Mar 3, 2022 · 0eaefcc · 0eaefcc
1 parent a636bdf
commit 0eaefcc
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/bukkit/src/main/java/net/silthus/schat/bukkit/placeholderapi/PlaceholderApiIntegration.java b/bukkit/src/main/java/net/silthus/schat/bukkit/placeholderapi/PlaceholderApiIntegration.java
@@ -27,9 +27,10 @@
 import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextReplacementConfig;
+import net.silthus.schat.message.MessageSource;
 import net.silthus.schat.ui.placeholder.Replacements;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 
 public class PlaceholderApiIntegration {
 
@@ -41,15 +42,14 @@ public PlaceholderApiIntegration(Replacements replacements) {
 
     public void init() {
         replacements.addMessageReplacement(message -> {
-            final Player player = Bukkit.getPlayer(message.source().uniqueId());
-            if (player != null)
-                return replacePlaceholderAPIPlaceholders(player);
-            else
+            if (message.source().equals(MessageSource.nil()))
                 return null;
+            else
+                return replacePlaceholderAPIPlaceholders(Bukkit.getOfflinePlayer(message.source().uniqueId()));
         });
     }
 
-    private TextReplacementConfig replacePlaceholderAPIPlaceholders(Player player) {
+    private TextReplacementConfig replacePlaceholderAPIPlaceholders(OfflinePlayer player) {
         return TextReplacementConfig.builder()
             .match(Pattern.compile("(%[a-zA-Z0-9_-]+%)"))
             .replacement((matchResult, builder) -> Component.text(PlaceholderAPI.setPlaceholders(player, matchResult.group())))