TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 11:49:12 +00:00
Code Issues Projects Releases Wiki Activity

Ensure MessageFormat's are clean before parsing

Browse source
This commit is contained in:
Josh Roy 2021-07-01 12:13:51 -04:00
parent 4ce38bde36
commit 11836e6662
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java
View file

@ -275,10 +275,12 @@ public class DiscordSettings implements IConf {
private MessageFormat generateMessageFormat(String content, String defaultStr, boolean format, String... arguments) { private MessageFormat generateMessageFormat(String content, String defaultStr, boolean format, String... arguments) {
content = content == null ? defaultStr : content; content = content == null ? defaultStr : content;
content = format ? FormatUtil.replaceFormat(content) : FormatUtil.stripFormat(content); content = format ? FormatUtil.replaceFormat(content) : FormatUtil.stripFormat(content);
content = content.replace("'", "''");
for (int i = 0; i < arguments.length; i++) { for (int i = 0; i < arguments.length; i++) {
content = content.replace("{" + arguments[i] + "}", "{" + i + "}"); content = content.replace("{" + arguments[i] + "}", "{" + i + "}");
content = content.replace("{" + arguments[i].toUpperCase() + "}", "{" + i + "}"); content = content.replace("{" + arguments[i].toUpperCase() + "}", "{" + i + "}");
} }
content = content.replaceAll("\\{([^0-9]+)}", "'{$1}'");
return new MessageFormat(content); return new MessageFormat(content);
} }