diff options
author | snowleo <schneeleo@gmail.com> | 2011-08-08 16:30:32 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-08-08 16:30:32 +0200 |
commit | fbd9ee9453cdfec7367effba3cb2bc388e3ee88b (patch) | |
tree | 64e08e222c5a87eedc58ab8579380047a54dac53 /EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | |
parent | 8185b05b5d8a1feb60e70ebbddb907e08dbeeed5 (diff) | |
download | Essentials-fbd9ee9453cdfec7367effba3cb2bc388e3ee88b.tar Essentials-fbd9ee9453cdfec7367effba3cb2bc388e3ee88b.tar.gz Essentials-fbd9ee9453cdfec7367effba3cb2bc388e3ee88b.tar.lz Essentials-fbd9ee9453cdfec7367effba3cb2bc388e3ee88b.tar.xz Essentials-fbd9ee9453cdfec7367effba3cb2bc388e3ee88b.zip |
XMPP: Let xmpp users see xmpp messages from other xmpp users.
Diffstat (limited to 'EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java')
-rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | 9 |
1 files changed, 5 insertions, 4 deletions
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<String, Chat> chats = Collections.synchronizedMap(new HashMap<String, Chat>()); private final transient Set<LogRecord> logrecords = Collections.synchronizedSet(new HashSet<LogRecord>()); - private final transient JavaPlugin parent; + private final transient IEssentialsXMPP parent; private transient List<String> 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("<X:" + EssentialsXMPP.getInstance().getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant())) + "> " + 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); |