Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2024-11-29 13:36:04 +01:00
Code Issues Projects Releases Wiki Activity

Check for null color codes

Browse Source
This commit is contained in:
cnaude 2017-09-15 06:31:07 -07:00
parent 55f65256a0
commit f2f53ece48
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
View File

@ -498,7 +498,7 @@ public class ChatTokenizer {
* @return * @return
*/ */
public String discordChatToIRCTokenizer(String template, String username, String nickname, String effectiveName, Color color, String discordChannel, String message) { public String discordChatToIRCTokenizer(String template, String username, String nickname, String effectiveName, Color color, String discordChannel, String message) {
String hex = Integer.toHexString(color.getRGB()).toUpperCase(); String hex = color != null ? Integer.toHexString(color.getRGB()).toUpperCase() : "99AAB5";
if (hex.length() == 8) { if (hex.length() == 8) {
hex = hex.substring(2); hex = hex.substring(2);
} }
@ -509,7 +509,11 @@ public class ChatTokenizer {
if (effectiveName == null) { if (effectiveName == null) {
effectiveName = ""; effectiveName = "";
} }
String colorCode = ChatColor.translateAlternateColorCodes('&', DiscordSRV.getPlugin().getColors().get(hex)); String translatedColor = DiscordSRV.getPlugin().getColors().get(hex);
String colorCode = ChatColor.translateAlternateColorCodes('&', translatedColor);
if (colorCode == null) {
colorCode = "";
}
return plugin.colorConverter.gameColorsToIrc(template return plugin.colorConverter.gameColorsToIrc(template
.replace("%NAME%", username) .replace("%NAME%", username)
.replace("%NICKNAME%", nickname) .replace("%NICKNAME%", nickname)