Don't replace placeholder if given player identifier is not found

plan-player-analytics · May 28, 2022 · 8ee494f · 8ee494f
1 parent 3119f35
commit 8ee494f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlanPlaceholders.java b/Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlanPlaceholders.java
@@ -121,11 +121,14 @@ public String onPlaceholderRequest(UUID uuid, String placeholder, List<String> p
             return Objects.toString(staticLoader.apply(arguments));
         }
 
-        UUID playerUUID = arguments.get(0)
-                .flatMap(this::getPlayerUUIDForIdentifier)
-                .orElse(uuid);
+        Optional<String> givenIdentifier = arguments.get(0);
+        Optional<UUID> foundUUID = givenIdentifier
+                .flatMap(this::getPlayerUUIDForIdentifier);
+        UUID playerUUID = foundUUID.orElse(uuid);
         PlayerContainer player;
-        if (playerUUID != null) {
+        if (givenIdentifier.isPresent() && !foundUUID.isPresent()) {
+            player = null; // Don't show other player whose identifier is not found.
+        } else if (playerUUID != null) {
             player = dbSystem.getDatabase().query(ContainerFetchQueries.fetchPlayerContainer(playerUUID));
         } else {
             player = null;