diff options
| author | okamosy <okamosy@gmail.com> | 2011-10-30 21:30:21 +0000 |
|---|---|---|
| committer | okamosy <okamosy@gmail.com> | 2011-10-30 21:30:21 +0000 |
| commit | dd87dcdd3d3d94d00a38dbb37280fad183356601 (patch) | |
| tree | 5eb10376287f9d3a4435e62168195598a42ccd8c /EssentialsXMPP/src | |
| parent | ffd7ba7d5f2312ea9fc1c818b39938e5d7de86b6 (diff) | |
| parent | 4ac03ef15a7c729a683bfd65b419d0d6ca65756c (diff) | |
| download | Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.tar Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.tar.gz Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.tar.lz Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.tar.xz Essentials-dd87dcdd3d3d94d00a38dbb37280fad183356601.zip | |
Merge branch 'master' of github.com:essentials/Essentials into ess
Diffstat (limited to 'EssentialsXMPP/src')
3 files changed, 7 insertions, 4 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java index 34f862627..631d1b21b 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java @@ -124,14 +124,17 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP } @Override - public void broadcastMessage(final IUser sender, final String message) + public void broadcastMessage(final IUser sender, final String message, final String xmppAddress) { ess.broadcastMessage(sender, message); try { for (String address : getSpyUsers()) { - sendMessage(address, message); + if (!address.equalsIgnoreCase(xmppAddress)) + { + sendMessage(address, message); + } } } catch (Exception ex) diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java index 1ed9fa732..0635ca131 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java @@ -24,5 +24,5 @@ public interface IEssentialsXMPP extends Plugin boolean toggleSpy(final Player user); - void broadcastMessage(final IUser sender, final String message); + void broadcastMessage(final IUser sender, final String message, final String xmppAddress); } diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java index d7aedb9f4..cbe89f9d6 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -103,7 +103,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager break; default: final IUser sender = parent.getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant())); - parent.broadcastMessage(sender, "="+sender.getDisplayName()+": "+ message); + parent.broadcastMessage(sender, "="+sender.getDisplayName()+": "+ message, StringUtils.parseBareAddress(chat.getParticipant())); } } } |