Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2024-09-28 14:37:37 +02:00
Code Issues Projects Releases Wiki Activity

Don't truncate linked messages.

Browse Source 
Tokenize smsg response correctly.
This commit is contained in:
cnaude 2015-06-24 19:49:30 -07:00
parent 5728d279e7
commit d5d3f02a9d
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/cnaude/purpleirc/Commands/SMsg.java
View File

@ -82,7 +82,7 @@ public class SMsg implements IRCCommandInterface {
String targetMsg = plugin.tokenizer.gameChatTokenizer(player, template, msg);
String responseTemplate = plugin.getMsgTemplate("MAIN", "", TemplateName.GAME_PCHAT_RESPONSE);
if (!responseTemplate.isEmpty()) {
String responseMsg = plugin.tokenizer.gameChatTokenizer(player, responseTemplate, msg);
String responseMsg = plugin.tokenizer.msgChatResponseTokenizer(player.getName(), responseTemplate, msg);
sender.sendMessage(responseMsg);
}
plugin.logDebug("Tokenized message: " + targetMsg);
@ -120,12 +120,12 @@ public class SMsg implements IRCCommandInterface {
if (ircBot.botLinkingEnabled) {
final String template = plugin.getMsgTemplate(ircBot.botNick, "", TemplateName.GAME_PCHAT_RESPONSE);
if (sender instanceof Player) {
ircBot.msgRemotePlayer((Player) sender, remoteBot, remotePlayer, msg.substring(1));
ircBot.msgRemotePlayer((Player) sender, remoteBot, remotePlayer, msg);
} else {
ircBot.msgRemotePlayer(sender, remoteBot, remotePlayer, msg.substring(1));
ircBot.msgRemotePlayer(sender, remoteBot, remotePlayer, msg);
}
if (!template.isEmpty()) {
sender.sendMessage(plugin.tokenizer.msgChatResponseTokenizer(target, msg.substring(1), template));
sender.sendMessage(plugin.tokenizer.msgChatResponseTokenizer(target, msg, template));
}
}
}

3
src/main/java/com/cnaude/purpleirc/LinkUpdater.java
View File

@ -20,8 +20,7 @@ import org.bukkit.scheduler.BukkitTask;
/**
*
* @author Chris Naude This thread checks each for users and updates the
* internal lists.
* @author Chris Naude This thread sends player info to linked bots.
*/
public class LinkUpdater {

2
src/main/java/com/cnaude/purpleirc/PurpleBot.java
View File

@ -3055,7 +3055,7 @@ public final class PurpleBot {
for (String remoteBot : botLinks.keySet()) {
String code = botLinks.get(remoteBot);
String clearText = "PLAYER_INFO:" + code + ":"
+ plugin.getServer().getOnlinePlayers().size()
+ plugin.getOnlinePlayerCount()
+ ":" + plugin.getServer().getMaxPlayers();
List<String> players = new ArrayList<>();
for (Player player : plugin.getServer().getOnlinePlayers()) {

11
src/main/java/com/cnaude/purpleirc/PurpleIRC.java
View File

@ -1604,4 +1604,15 @@ public class PurpleIRC extends JavaPlugin {
return String.format("%s:%s", cmd, encodedText);
}
/**
* Generic player counter. CB uses Player[] and Spigot uses List<>().
*/
public int getOnlinePlayerCount() {
int count = 0;
for (Player player : getServer().getOnlinePlayers()) {
count++;
}
return count;
}
}