Merge remote-tracking branch 'origin/1.6.x' into 1.6.x

This commit is contained in:
ProSavage 2018-11-18 11:25:07 -06:00
commit ff6a3b2b1a

View File

@ -179,9 +179,9 @@ public class FactionsChatListener implements Listener {
// Relation Colored?
if (Conf.chatTagRelationColored) {
// We must choke the standard message and send out individual messages to all players
// Why? Because the relations will differ.
event.setCancelled(true);
// Messages are sent to players individually
// This still leaves a chance for other plugins to pick it up
event.getRecipients().clear();
for (Player listeningPlayer : event.getRecipients()) {
FPlayer you = FPlayers.getInstance().getByPlayer(listeningPlayer);
@ -200,10 +200,9 @@ public class FactionsChatListener implements Listener {
// Write to the log... We will write the non colored message.
String nonColoredMsg = ChatColor.stripColor(String.format(nonColoredMsgFormat, talkingPlayer.getDisplayName(), msg));
Bukkit.getLogger().log(Level.INFO, nonColoredMsg);
} else {
// No relation color.
event.setFormat(nonColoredMsgFormat);
}
// Message with no relation color.
event.setFormat(nonColoredMsgFormat);
}
private void doWarmup(final String warp, final FPlayer fme) {