From fbd9ee9453cdfec7367effba3cb2bc388e3ee88b Mon Sep 17 00:00:00 2001 From: snowleo Date: Mon, 8 Aug 2011 16:30:32 +0200 Subject: XMPP: Let xmpp users see xmpp messages from other xmpp users. --- EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 f33f29416..e43844c5b 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -38,14 +38,14 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager private transient ChatManager chatManager; private final transient Map chats = Collections.synchronizedMap(new HashMap()); private final transient Set logrecords = Collections.synchronizedSet(new HashSet()); - private final transient JavaPlugin parent; + private final transient IEssentialsXMPP parent; private transient List logUsers; private transient Level logLevel; private transient boolean ignoreLagMessages = true; private transient Thread loggerThread; private transient boolean threadrunning = true; - public XMPPManager(final JavaPlugin parent) + public XMPPManager(final IEssentialsXMPP parent) { super(); this.parent = parent; @@ -101,7 +101,8 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager sendCommand(chat, message); break; default: - parent.getServer().broadcastMessage(" " + message); + final String name = parent.getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant())); + parent.broadcastMessage(name, "="+name+": "+ message); } } } @@ -350,7 +351,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager } else { - final String from = "[X:" + EssentialsXMPP.getInstance().getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant())) + ">"; + final String from = "[" + parent.getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant())) + ">"; for (Player p : matches) { p.sendMessage(from + p.getDisplayName() + "] " + message); -- cgit v1.2.3