SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ProSavage 2018-11-18 11:25:07 -06:00
commit ff6a3b2b1a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java
View File

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