Skip to content

Fix regression w/empty strings with KeywordReplacer#5378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JRoy merged 1 commit into from
Jun 2, 2023
Merged

Fix regression w/empty strings with KeywordReplacer #5378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/textreader/KeywordReplacer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,7 +142,7 @@ private void replaceKeywords(final CommandSource sender) {
String line = input.getLines().get(i);

// Skip processing b64 encoded items, they will not have keywords in them.
if (line.charAt(0) == '@') {
if (line.startsWith("@")) {
replaced.add(line);
continue;
}
Expand DownExpand Up@@ -383,7 +383,7 @@ private String replaceLine(String line, final String fullMatch, final String[] m

if (this.replaceSpacesWithUnderscores) {
// Don't replace spaces with underscores in command nor escape underscores.
if (line.charAt(0) != '/') {
if (line.startsWith("/")) {
replacer = replacer.replace("_", "\\_").replaceAll("\\s", "_");
}
}
Expand Down