diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-12-20 23:37:37 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-12-20 23:37:37 +0000 |
commit | 226a75472cc394a2da1656e1a8874379dc028c2d (patch) | |
tree | 4d0f40b426e7b83e44d8ecb8acb09ea355c28d20 | |
parent | a1c88a140e461dc55d346d416b9b445455aea5f0 (diff) | |
download | Essentials-226a75472cc394a2da1656e1a8874379dc028c2d.tar Essentials-226a75472cc394a2da1656e1a8874379dc028c2d.tar.gz Essentials-226a75472cc394a2da1656e1a8874379dc028c2d.tar.lz Essentials-226a75472cc394a2da1656e1a8874379dc028c2d.tar.xz Essentials-226a75472cc394a2da1656e1a8874379dc028c2d.zip |
Adjust section matching.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/Settings.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index 2ad5a444c..d3c6b49d5 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -237,29 +237,31 @@ public class Settings implements ISettings } return 0.0; } - private Set<String> socialSpyCommands = new HashSet<String>(); - + public Set<String> _getSocialSpyCommands() { Set<String> socialspyCommands = new HashSet<String>(); - - if (!config.hasProperty("socialspy-commands")) { - socialspyCommands.addAll(Arrays.asList("msg", "r", "mail", "m", "whisper", "emsg", "t", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm")); + + if (config.isConfigurationSection("socialspy-commands")) + { + for (String c : config.getStringList("socialspy-commands")) + { + socialspyCommands.add(c.toLowerCase(Locale.ENGLISH)); + } } - - for (String c : config.getStringList("socialspy-commands")) + else { - socialspyCommands.add(c.toLowerCase(Locale.ENGLISH)); + socialspyCommands.addAll(Arrays.asList("msg", "r", "mail", "m", "whisper", "emsg", "t", "tell", "er", "reply", "ereply", "email", "action", "describe", "eme", "eaction", "edescribe", "etell", "ewhisper", "pm")); } return socialspyCommands; } - - public Set<String> getSocialSpyCommands() { + + public Set<String> getSocialSpyCommands() + { return socialSpyCommands; } - private String nicknamePrefix = "~"; private String _getNicknamePrefix() |