Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-28 22:47:38 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aurora Lahtela 2022-05-28 10:22:48 +03:00
parent 3119f35cb6
commit 8ee494f6e4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlanPlaceholders.java
View File

@ -121,11 +121,14 @@ public final class PlanPlaceholders {
return Objects.toString(staticLoader.apply(arguments)); return Objects.toString(staticLoader.apply(arguments));
} }
UUID playerUUID = arguments.get(0) Optional<String> givenIdentifier = arguments.get(0);
.flatMap(this::getPlayerUUIDForIdentifier) Optional<UUID> foundUUID = givenIdentifier
.orElse(uuid); .flatMap(this::getPlayerUUIDForIdentifier);
UUID playerUUID = foundUUID.orElse(uuid);
PlayerContainer player; 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)); player = dbSystem.getDatabase().query(ContainerFetchQueries.fetchPlayerContainer(playerUUID));
} else { } else {
player = null; player = null;