Upstream
/
PurpleIRC-spigot
mirror of https://github.com/cnaude/PurpleIRC-spigot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Null pointer fix.

This commit is contained in:
cnaude 2016-07-02 09:05:48 -07:00
parent b531296388
commit 3b2be57efd
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,9 +185,17 @@ public class ChatTokenizer {
plugin.logDebug("ircChatToGameTokenizer: null player: " + ircNick);
tmpl = playerTokenizer(ircNick, template);
}
String nickPrefix = ircBot.getNickPrefix(user, channel);
String channelPrefix = ircBot.getChannelPrefix(channel);
if (nickPrefix == null) {
nickPrefix = "";
}
if (channelPrefix == null) {
channelPrefix = "";
}
return plugin.colorConverter.ircColorsToGame(ircUserTokenizer(tmpl, user, ircBot)
.replace("%NICKPREFIX%", ircBot.getNickPrefix(user, channel))
.replace("%CHANNELPREFIX%", ircBot.getChannelPrefix(channel))
.replace("%NICKPREFIX%", nickPrefix)
.replace("%CHANNELPREFIX%", channelPrefix)
.replace("%MESSAGE%", message)
.replace("%CHANNEL%", channel.getName()));
}