diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-06-03 02:22:32 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-06-03 02:22:32 +0000 |
| commit | 991a5cb24c508d5ee8b383b594cf9ae5feeb5a1d (patch) | |
| tree | 4c99cd3acdd1ff2a7f35c5f7b7b979cab72290e7 /EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | |
| parent | e8e97e86a0c8e18171fbca0d588ab3ba640f58c1 (diff) | |
| download | Essentials-991a5cb24c508d5ee8b383b594cf9ae5feeb5a1d.tar Essentials-991a5cb24c508d5ee8b383b594cf9ae5feeb5a1d.tar.gz Essentials-991a5cb24c508d5ee8b383b594cf9ae5feeb5a1d.tar.lz Essentials-991a5cb24c508d5ee8b383b594cf9ae5feeb5a1d.tar.xz Essentials-991a5cb24c508d5ee8b383b594cf9ae5feeb5a1d.zip | |
Fixes for XMPP: display minecraft username for players that have set their address using /setxmpp, others will have the jabber address next to the message
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1576 e251c2fe-e539-e718-e476-b85c1f46cddb
Diffstat (limited to 'EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java')
| -rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java index 9ce9d72e0..f750e83ed 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -85,7 +85,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager sendCommand(chat, message); break; default: - parent.getServer().broadcastMessage("<XMPP:" + StringUtils.parseBareAddress(chat.getParticipant()) + "> " + message); + parent.getServer().broadcastMessage("<X:" + EssentialsXMPP.getInstance().getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant())) + "> " + message); } } } @@ -258,10 +258,10 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager } else { + final String from = "[X:" + EssentialsXMPP.getInstance().getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant())) + ">"; for (Player p : matches) { - - p.sendMessage("[" +StringUtils.parseBareAddress(chat.getParticipant()) + ">" + p.getDisplayName() + "] " + message); + p.sendMessage(from + p.getDisplayName() + "] " + message); } } } |