From 8ee494f6e45c2cac4e6f665422097ec7df0eae52 Mon Sep 17 00:00:00 2001
From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com>
Date: Sat, 28 May 2022 10:22:48 +0300
Subject: [PATCH] Don't replace placeholder if given player identifier is not
 found

---
 .../djrapitops/plan/placeholder/PlanPlaceholders.java | 11 +++++++----
 1 file changed, 7 insertions(+), 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
index b54e44c64..60e00dfeb 100644
--- 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 final class PlanPlaceholders {
             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;