Merge pull request #9720 from adwitkow/private-chat
chat: fix private chat username recolouring, improve responsiveness to config settings
This commit is contained in:
@@ -119,12 +119,8 @@ public class ChatMessageManager
|
||||
|
||||
switch (chatMessageType)
|
||||
{
|
||||
case MODPRIVATECHAT:
|
||||
case PRIVATECHAT:
|
||||
case PRIVATECHATOUT:
|
||||
usernameColor = isChatboxTransparent ? chatColorConfig.transparentPrivateUsernames() : chatColorConfig.opaquePrivateUsernames();
|
||||
break;
|
||||
|
||||
// username recoloring for MODPRIVATECHAT, PRIVATECHAT and PRIVATECHATOUT
|
||||
// ChatMessageTypes is handled in the script callback event
|
||||
case TRADEREQ:
|
||||
case AUTOTYPER:
|
||||
case PUBLICCHAT:
|
||||
@@ -399,6 +395,11 @@ public class ChatMessageManager
|
||||
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.opaqueFilteredHighlight(), false),
|
||||
ChatMessageType.SPAM);
|
||||
}
|
||||
if (chatColorConfig.opaquePrivateUsernames() != null)
|
||||
{
|
||||
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.opaquePrivateUsernames(), false),
|
||||
ChatMessageType.LOGINLOGOUTNOTIFICATION);
|
||||
}
|
||||
|
||||
//Transparent Chat Colours
|
||||
if (chatColorConfig.transparentPublicChat() != null)
|
||||
@@ -527,6 +528,11 @@ public class ChatMessageManager
|
||||
cacheColor(new ChatColor(ChatColorType.HIGHLIGHT, chatColorConfig.transparentFilteredHighlight(), true),
|
||||
ChatMessageType.SPAM);
|
||||
}
|
||||
if (chatColorConfig.transparentPrivateUsernames() != null)
|
||||
{
|
||||
cacheColor(new ChatColor(ChatColorType.NORMAL, chatColorConfig.transparentPrivateUsernames(), true),
|
||||
ChatMessageType.LOGINLOGOUTNOTIFICATION);
|
||||
}
|
||||
}
|
||||
|
||||
private void cacheColor(final ChatColor chatColor, final ChatMessageType... types)
|
||||
|
||||
Reference in New Issue
Block a user