PlaceholderAPI: fix getting default placeholders

Flectone · Nov 5, 2023 · 0f7dc20 · 0f7dc20
1 parent fdea643
commit 0f7dc20
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/net/flectone/chat/module/integrations/FPlaceholderAPI.java b/src/main/java/net/flectone/chat/module/integrations/FPlaceholderAPI.java
@@ -51,10 +51,12 @@ public String onRequest(@Nullable OfflinePlayer player, @NotNull String params)
             default -> null;
         };
 
+        if (placeholder != null) return placeholder;
+
         FModule fModule = FlectoneChat.getModuleManager().get(NameModule.class);
-        if (!(fModule instanceof NameModule nameModule)) return placeholder;
+        if (!(fModule instanceof NameModule nameModule)) return null;
         Player onlinePlayer = fPlayer.getPlayer();
-        if (onlinePlayer == null) return placeholder;
+        if (onlinePlayer == null) return null;
 
         return switch (params.toLowerCase()) {
             case "player_name_real" -> nameModule.getReal(onlinePlayer);