From d2ecb911f2e524cde97149acaf863947a9c8ea36 Mon Sep 17 00:00:00 2001 From: NotAlexNoyle Date: Thu, 16 Apr 2026 08:19:30 -0400 Subject: [PATCH] Fix double spaces appended to prefixes --- .../luckperms/common/CommonExpansion.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/io/github/miniplaceholders/expansion/luckperms/common/CommonExpansion.java b/common/src/main/java/io/github/miniplaceholders/expansion/luckperms/common/CommonExpansion.java index 7318f5b..85949fe 100644 --- a/common/src/main/java/io/github/miniplaceholders/expansion/luckperms/common/CommonExpansion.java +++ b/common/src/main/java/io/github/miniplaceholders/expansion/luckperms/common/CommonExpansion.java @@ -29,14 +29,14 @@ public record CommonExpansion(LuckPerms luckPerms) { if (user == null) { return null; } - return Tag.inserting(parsePossibleLegacy(user.getCachedData().getMetaData().getPrefix(), ctx)); + return Tag.inserting(parsePossibleLegacy(stripOrNull(user.getCachedData().getMetaData().getPrefix()), ctx)); }) .audiencePlaceholder("suffix", (aud, queue, ctx) -> { final User user = user(aud); if (user == null) { return null; } - return Tag.inserting(parsePossibleLegacy(user.getCachedData().getMetaData().getSuffix(), ctx)); + return Tag.inserting(parsePossibleLegacy(stripOrNull(user.getCachedData().getMetaData().getSuffix()), ctx)); }) .audiencePlaceholder("meta", (aud, queue, ctx) -> { final User user = user(aud); @@ -52,7 +52,7 @@ public record CommonExpansion(LuckPerms luckPerms) { if (result == null) { return TagsUtils.EMPTY_TAG; } - return Tag.preProcessParsed(result); + return Tag.preProcessParsed(result.strip()); }) .audiencePlaceholder("has_permission", (aud, queue, ctx) -> { final User user = user(aud); @@ -85,7 +85,7 @@ public record CommonExpansion(LuckPerms luckPerms) { return null; } final Component groups = user.getInheritedGroups(user.getQueryOptions()).stream() - .map(group -> parsePossibleLegacy(group.getDisplayName(), ctx)) + .map(group -> parsePossibleLegacy(stripOrNull(group.getDisplayName()), ctx)) .collect(Component.toComponent(Component.text(", "))); return Tag.selfClosingInserting(groups); }) @@ -98,7 +98,7 @@ public record CommonExpansion(LuckPerms luckPerms) { if (primaryGroup == null) { return TagsUtils.EMPTY_TAG; } - return Tag.preProcessParsed(primaryGroup); + return Tag.preProcessParsed(primaryGroup.strip()); }) .audiencePlaceholder("inherits_group", (aud, queue, ctx) -> { final User user = user(aud); @@ -113,6 +113,10 @@ public record CommonExpansion(LuckPerms luckPerms) { }); } + private static String stripOrNull(final String value) { + return value == null ? null : value.strip(); + } + private User user(final Audience audience) { final UUID uuid = audience.get(Identity.UUID).orElse(null); if (uuid == null) {