Google
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix chat translation parameters not having color sometimes

This commit is contained in:
rtm516 2020-08-11 18:45:14 +01:00
parent 31fec1d4bf
commit 016a5c04ea
No known key found for this signature in database
GPG Key ID: 331715B8B007C67A
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
View File

@ -110,14 +110,6 @@ public class MessageUtils {
strings.add(builder); strings.add(builder);
} }
if (translation.getKey().equals("commands.gamemode.success.other")) {
strings.add("");
}
if (translation.getKey().equals("command.context.here")) {
strings.add(" - no permission or invalid command!");
}
// Collect all params and add format corrections to the end of them // Collect all params and add format corrections to the end of them
List<String> furtherParams = new ArrayList<>(); List<String> furtherParams = new ArrayList<>();
for (String param : getTranslationParams(translation.getWith(), locale, message)) { for (String param : getTranslationParams(translation.getWith(), locale, message)) {
@ -133,9 +125,16 @@ public class MessageUtils {
} }
if (locale != null) { if (locale != null) {
strings.add(insertParams(LocaleUtils.getLocaleString(translation.getKey(), locale), furtherParams)); String builder = getFormat(message.getStyle().getFormats()) +
getColor(message.getStyle().getColor());
builder += insertParams(LocaleUtils.getLocaleString(translation.getKey(), locale), furtherParams);
strings.add(builder);
} else { } else {
strings.addAll(furtherParams); String format = getFormat(message.getStyle().getFormats()) +
getColor(message.getStyle().getColor());
for (String param : furtherParams) {
strings.add(format + param);
}
} }
} else { } else {
String builder = getFormat(message.getStyle().getFormats()) + String builder = getFormat(message.getStyle().getFormats()) +