diff options
| author | md_5 <md_5@bigpond.com> | 2012-03-01 16:23:21 +1100 |
|---|---|---|
| committer | md_5 <md_5@bigpond.com> | 2012-03-01 16:23:21 +1100 |
| commit | 10ccc503ee5b528ad68e0053afd2fef2955b21ef (patch) | |
| tree | 524cc3e2cbde9a290f830341bd4132c878780f6b /EssentialsXMPP | |
| parent | f96c546e3cf65f283a20b8181a97d8c8cbf26476 (diff) | |
| parent | 60157e5a8ca36905604409662061d340b0c8bf25 (diff) | |
| download | Essentials-10ccc503ee5b528ad68e0053afd2fef2955b21ef.tar Essentials-10ccc503ee5b528ad68e0053afd2fef2955b21ef.tar.gz Essentials-10ccc503ee5b528ad68e0053afd2fef2955b21ef.tar.lz Essentials-10ccc503ee5b528ad68e0053afd2fef2955b21ef.tar.xz Essentials-10ccc503ee5b528ad68e0053afd2fef2955b21ef.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'EssentialsXMPP')
| -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 { |