From 2ad527b85baa1d87d48025bf189c61cbcc6057e4 Mon Sep 17 00:00:00 2001 From: drtshock Date: Tue, 19 May 2015 15:57:02 -0500 Subject: [PATCH] Don't send spy messages to spyers who are the ones sending the message. --- .../factions/listeners/FactionsChatListener.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java index bb1ea025..ec182d3f 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java @@ -42,7 +42,7 @@ public class FactionsChatListener implements Listener { //Send to any players who are spying chat for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { - if (fplayer.isSpyingChat() && fplayer.getFaction() != myFaction) { + if (fplayer.isSpyingChat() && fplayer.getFaction() != myFaction && me != fplayer) { fplayer.sendMessage("[FCspy] " + myFaction.getTag() + ": " + message); } } @@ -60,10 +60,7 @@ public class FactionsChatListener implements Listener { for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { if (myFaction.getRelationTo(fplayer) == Relation.ALLY && !fplayer.isIgnoreAllianceChat()) { fplayer.sendMessage(message); - } - - //Send to any players who are spying chat - else if (fplayer.isSpyingChat()) { + } else if (fplayer.isSpyingChat() && me != fplayer) { fplayer.sendMessage("[ACspy]: " + message); } } @@ -83,10 +80,7 @@ public class FactionsChatListener implements Listener { for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { if (myFaction.getRelationTo(fplayer) == Relation.TRUCE) { fplayer.sendMessage(message); - } - - //Send to any players who are spying chat - else if (fplayer.isSpyingChat()) { + } else if (fplayer.isSpyingChat() && fplayer != me) { fplayer.sendMessage("[TCspy]: " + message); } }