From 991a5cb24c508d5ee8b383b594cf9ae5feeb5a1d Mon Sep 17 00:00:00 2001 From: snowleo Date: Fri, 3 Jun 2011 02:22:32 +0000 Subject: 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 --- EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java') 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(" " + message); + parent.getServer().broadcastMessage(" " + 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); } } } -- cgit v1.2.3