Skip to content
This repository has been archived by the owner on Jul 27, 2019. It is now read-only.

Commit

Permalink
Don't truncate linked messages.
Browse files Browse the repository at this point in the history 
Tokenize smsg response correctly.
  • Loading branch information
cnaude committed Jun 25, 2015
1 parent 15c7d3b commit f998a7f
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 38 deletions.
8 changes: 4 additions & 4 deletions src/main/java/com/cnaude/purpleirc/Commands/SMsg.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void dispatch(CommandSender sender, String[] args) {
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);
Expand Down Expand Up @@ -120,12 +120,12 @@ public void dispatch(CommandSender sender, String[] args) {
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));
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/cnaude/purpleirc/LinkUpdater.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@

/**
*
* @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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cnaude/purpleirc/PurpleBot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3055,7 +3055,7 @@ public void run() {
for (String remoteBot : botLinks.keySet()) {
String code = botLinks.get(remoteBot);
String clearText = "PLAYER_INFO:" + code + ":"
+ plugin.getServer().getOnlinePlayers().length
+ plugin.getOnlinePlayerCount()
+ ":" + plugin.getServer().getMaxPlayers();
List<String> players = new ArrayList<>();
for (Player player : plugin.getServer().getOnlinePlayers()) {
Expand Down
73 changes: 42 additions & 31 deletions src/main/java/com/cnaude/purpleirc/PurpleIRC.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ public void onEnable() {
detectHooks();
if (debugEnabled) {
getPurpleHooks(getServer().getConsoleSender(), false);
}
}
commandHandlers = new CommandHandlers(this);
ircTabCompleter = new PurpleTabCompleter(this);
getCommand("irc").setExecutor(commandHandlers);
Expand Down Expand Up @@ -887,7 +887,7 @@ public void setupVault() {
public String getPlayerGroup(Player player) {
String groupName = "";
try {
if (vaultHelpers != null) {
if (vaultHelpers != null) {
if (vaultHelpers.permission != null && vaultHelpers.permission != null) {
logDebug("getPlayerGroup: " + player.getName());
groupName = vaultHelpers.permission.getPrimaryGroup(player);
Expand Down Expand Up @@ -923,11 +923,11 @@ public UUID getPlayerUuid(String player) {
public String getPlayerGroup(String worldName, String player) {
String groupName = "";
try {
UUID uuid = getPlayerUuid(player);
if (vaultHelpers != null && uuid != null) {
UUID uuid = getPlayerUuid(player);
if (vaultHelpers != null && uuid != null) {
if (vaultHelpers.permission != null && vaultHelpers.permission != null) {
OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(uuid);
if (offlinePlayer != null) {
OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(uuid);
if (offlinePlayer != null) {
logDebug("getPlayerGroup: " + worldName + " " + player);
groupName = vaultHelpers.permission.getPrimaryGroup(worldName, offlinePlayer);
}
Expand Down Expand Up @@ -969,11 +969,11 @@ public String getPlayerPrefix(Player player) {
public String getPlayerPrefix(String worldName, String player) {
String prefix = "";
try {
UUID uuid = getPlayerUuid(player);
if (vaultHelpers != null && uuid != null) {
if (vaultHelpers.chat != null) {
OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(uuid);
if (offlinePlayer != null) {
UUID uuid = getPlayerUuid(player);
if (vaultHelpers != null && uuid != null) {
if (vaultHelpers.chat != null) {
OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(uuid);
if (offlinePlayer != null) {
logDebug("getPlayerPrefix: " + worldName + " " + player);
prefix = vaultHelpers.chat.getPlayerPrefix(worldName, offlinePlayer);
}
Expand Down Expand Up @@ -1015,11 +1015,11 @@ public String getPlayerSuffix(Player player) {
public String getPlayerSuffix(String worldName, String player) {
String suffix = "";
try {
UUID uuid = getPlayerUuid(player);
if (vaultHelpers != null && uuid != null) {
if (vaultHelpers.chat != null) {
OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(uuid);
if (offlinePlayer != null) {
UUID uuid = getPlayerUuid(player);
if (vaultHelpers != null && uuid != null) {
if (vaultHelpers.chat != null) {
OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(uuid);
if (offlinePlayer != null) {
logDebug("getPlayerSuffix: " + worldName + " " + offlinePlayer.getName());
suffix = vaultHelpers.chat.getPlayerSuffix(worldName, offlinePlayer);
}
Expand Down Expand Up @@ -1133,34 +1133,34 @@ public String getGroupPrefix(String worldName, String player) {
String prefix = "";
try {
logDebug("getGroupPrefix: 2");
UUID uuid = getPlayerUuid(player);
UUID uuid = getPlayerUuid(player);
logDebug("getGroupPrefix: 3");
if (vaultHelpers != null && uuid != null) {
if (vaultHelpers != null && uuid != null) {
logDebug("getGroupPrefix: 4");
if (vaultHelpers.chat != null && vaultHelpers.permission != null) {
logDebug("getGroupPrefix: 5");
String group = "";
String group = "";
logDebug("getGroupPrefix: 6");
OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(uuid);
OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(uuid);
logDebug("getGroupPrefix: 7");
if (offlinePlayer != null) {
if (offlinePlayer != null) {
logDebug("getGroupPrefix: 8");
group = vaultHelpers.permission.getPrimaryGroup(worldName, offlinePlayer);
logDebug("getGroupPrefix: 9");
}
logDebug("getGroupPrefix: 10");
if (group == null) {
if (group == null) {
logDebug("getGroupPrefix: 11");
group = "";
}
group = "";
}
logDebug("getGroupPrefix: 12");
prefix = vaultHelpers.chat.getGroupPrefix(worldName, group);
prefix = vaultHelpers.chat.getGroupPrefix(worldName, group);
logDebug("getGroupPrefix: 13");
}
}
if (prefix == null) {
prefix = "";
}
}
if (prefix == null) {
prefix = "";
}
} catch (Exception ex) {
logDebug("getGroupPrefix (" + player + "): " + ex.getMessage());
}
Expand Down Expand Up @@ -1387,7 +1387,7 @@ public boolean isUpdateCheckerEnabled() {
public String updateCheckerMode() {
return updateCheckerMode;
}

private String hookFormat(String name, boolean enabled) {
String message;

Expand Down Expand Up @@ -1602,6 +1602,17 @@ public void broadcastToGame(final String message, final String permission) {
public String encodeLinkMsg(String cmd, String msg) {
String encodedText = new String(Base64.encodeBase64(msg.getBytes()));
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;
}

}

0 comments on commit f998a7f

Please sign in to comment.