mirror of
https://github.com/essentials/Essentials.git
synced 2025-09-30 08:09:03 +02:00
XMPP: Let xmpp users see xmpp messages from other xmpp users.
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user