Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-02-03 22:11:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:essentials/Essentials into essmaster

Browse Source
This commit is contained in:
KHobbits 2011-10-30 01:37:40 +01:00
commit 982c3fef0d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
View File

@ -124,14 +124,17 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
} }
@Override @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); ess.broadcastMessage(sender, message);
try try
{ {
for (String address : getSpyUsers()) for (String address : getSpyUsers())
{ {
sendMessage(address, message); if (!address.equalsIgnoreCase(xmppAddress))
{
sendMessage(address, message);
}
} }
} }
catch (Exception ex) catch (Exception ex)

2
EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java
View File

@ -24,5 +24,5 @@ public interface IEssentialsXMPP extends Plugin
boolean toggleSpy(final Player user); boolean toggleSpy(final Player user);
void broadcastMessage(final IUser sender, final String message); void broadcastMessage(final IUser sender, final String message, final String xmppAddress);
} }

2
EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
View File

@ -103,7 +103,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
break; break;
default: default:
final IUser sender = parent.getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant())); 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()));
} }
} }
} }