diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-02-25 17:22:39 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-02-25 17:22:39 +0000 |
| commit | 9f02fb4dd4367fcaa8cca03b61e520e76c58030b (patch) | |
| tree | b70cafcdcd4d21bc734daa4107832f31129ee16b /EssentialsXMPP/src/com | |
| parent | 8042cefd3daca229066578fe83a9b75eac09bb31 (diff) | |
| parent | 07baa6e611f153dd75b512127a4aa9996fd04892 (diff) | |
| download | Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.tar Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.tar.gz Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.tar.lz Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.tar.xz Essentials-9f02fb4dd4367fcaa8cca03b61e520e76c58030b.zip | |
Merge branch 'master' into release
Diffstat (limited to 'EssentialsXMPP/src/com')
| -rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java | 4 | ||||
| -rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java index 85ef50949..a35312129 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java @@ -36,7 +36,7 @@ public class UserManager implements IConf public final String getUserByAddress(final String search) { - final List<String> usernames = users.getKeys(null); + final Set<String> usernames = users.getKeys(false); for (String username : usernames) { final String address = users.getString(username + "." + ADDRESS, null); @@ -73,7 +73,7 @@ public class UserManager implements IConf { users.load(); spyusers.clear(); - final List<String> keys = users.getKeys(null); + final Set<String> keys = users.getKeys(false); for (String key : keys) { if (isSpy(key)) diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java index 72bdb113d..bb44d3127 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -183,7 +183,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager if (config.getBoolean("log-enabled", false)) { LOGGER.addHandler(this); - logUsers = config.getStringList("log-users", new ArrayList<String>()); + logUsers = config.getStringList("log-users"); final String level = config.getString("log-level", "info"); try { @@ -351,7 +351,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager private void sendCommand(final Chat chat, final String message) { - if (config.getStringList("op-users", new ArrayList<String>()).contains(StringUtils.parseBareAddress(chat.getParticipant()))) + if (config.getStringList("op-users").contains(StringUtils.parseBareAddress(chat.getParticipant()))) { try { |