Skip to content

Fix keywords in kit commands not working #5377

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 keywords in kit commands not working #5377

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
12 changes: 11 additions & 1 deletion Essentials/src/main/java/com/earth2me/essentials/textreader/KeywordReplacer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,13 @@ private void replaceKeywords(final CommandSource sender) {

for (int i = 0; i < input.getLines().size(); i++) {
String line = input.getLines().get(i);

// Skip processing b64 encoded items, they will not have keywords in them.
if (line.charAt(0) == '@') {
replaced.add(line);
continue;
}

final Matcher matcher = KEYWORD.matcher(line);

while (matcher.find()) {
Expand Down Expand Up @@ -375,7 +382,10 @@ private String replaceLine(String line, final String fullMatch, final String[] m
}

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

//If this is just a regular keyword, lets throw it into the cache
Expand Down