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 b54e44c641..60e00dfeb5 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 String onPlaceholderRequest(UUID uuid, String placeholder, List p return Objects.toString(staticLoader.apply(arguments)); } - UUID playerUUID = arguments.get(0) - .flatMap(this::getPlayerUUIDForIdentifier) - .orElse(uuid); + Optional givenIdentifier = arguments.get(0); + Optional 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;