GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fixed colour and style formatting for some messages

Browse source
This commit is contained in:
rtm516 2020-04-13 22:29:22 +01:00
parent e67ed6dc8d
commit 3616aa07fe
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
View file

@ -58,7 +58,7 @@ public class MessageUtils {
strings.add(" - no permission or invalid command!");
}
List<String> furtherParams = getTranslationParams(translation.getTranslationParams());
List<String> furtherParams = getTranslationParams(translation.getTranslationParams(), locale);
if (locale != null) {
strings.add(insertParams(LocaleUtils.getLocaleString(translation.getTranslationKey(), locale), furtherParams));
}else{
@ -96,7 +96,11 @@ public class MessageUtils {
messageText = LocaleUtils.getLocaleString(messageText, locale);
}
StringBuilder builder = new StringBuilder(messageText);
StringBuilder builder = new StringBuilder();
builder.append(getFormat(message.getStyle().getFormats()));
builder.append(getColorOrParent(message.getStyle()));
builder.append(messageText);
for (Message msg : message.getExtra()) {
builder.append(getFormat(msg.getStyle().getFormats()));
builder.append(getColorOrParent(msg.getStyle()));
@ -139,8 +143,8 @@ public class MessageUtils {
private static String getColorOrParent(MessageStyle style) {
ChatColor chatColor = style.getColor();
if (chatColor == ChatColor.NONE) {
return getColor(style.getParent().getColor());
if (chatColor == ChatColor.NONE && style.getParent() != null) {
return getColorOrParent(style.getParent());
}
return getColor(chatColor);