Fix double spaces appended to prefixes

This commit is contained in:
NotAlexNoyle committed 2026-04-16 08:19:30 -04:00
1 parent 2fb9457cd2
commit d2ecb911f2
1 file changed
+9 -5
@@ -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) {