SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2024-11-18 12:56:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix trailing/leading space after placeholder once and for all (#427)

Browse Source
This commit is contained in:
Ivan Pekov 2020-08-06 21:45:27 +03:00 committed by GitHub
parent 2d72e274e3
commit c648d6a541
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java
View File

@ -100,11 +100,13 @@ public final class CharsReplacer implements Replacer {
boolean identified = false; boolean identified = false;
boolean oopsitsbad = true; boolean oopsitsbad = true;
boolean hadSpace = false;
while (++i < chars.length) { while (++i < chars.length) {
final char p = chars[i]; final char p = chars[i];
if (p == ' ' && !identified) { if (p == ' ' && !identified) {
hadSpace = true;
break; break;
} }
if (p == closure.tail) { if (p == closure.tail) {
@ -137,7 +139,9 @@ public final class CharsReplacer implements Replacer {
builder.append('_').append(parametersString); builder.append('_').append(parametersString);
} }
builder.append(' '); if (hadSpace) {
builder.append(' ');
}
continue; continue;
} }
@ -168,15 +172,7 @@ public final class CharsReplacer implements Replacer {
builder.append(ChatColor.translateAlternateColorCodes('&', replacement)); builder.append(ChatColor.translateAlternateColorCodes('&', replacement));
} }
if (builder.length() == 0) { return builder.toString();
return "";
}
char c = builder.charAt(builder.length() - 1);
if (c == ' ') {
return builder.substring(0, builder.length() - 1);
} else {
return builder.toString();
}
} }
} }