diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-12-20 15:36:01 -0800 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-12-20 15:36:01 -0800 |
commit | a1c88a140e461dc55d346d416b9b445455aea5f0 (patch) | |
tree | 0fda003f73eaa68e4af5d9533db35b23d1e9229e | |
parent | 27db9e8c3bbcdd72fa0467600fc5c70ea09c8956 (diff) | |
parent | 2c3218b05667ad539f3f309f1a89361fdb1a8aad (diff) | |
download | Essentials-a1c88a140e461dc55d346d416b9b445455aea5f0.tar Essentials-a1c88a140e461dc55d346d416b9b445455aea5f0.tar.gz Essentials-a1c88a140e461dc55d346d416b9b445455aea5f0.tar.lz Essentials-a1c88a140e461dc55d346d416b9b445455aea5f0.tar.xz Essentials-a1c88a140e461dc55d346d416b9b445455aea5f0.zip |
Merge pull request #227 from Elvaron/2.9
FallBack for missing config property
-rw-r--r-- | Essentials/src/com/earth2me/essentials/Settings.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index 71cee631c..2ad5a444c 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -243,6 +243,11 @@ public class Settings implements ISettings 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")); + } + for (String c : config.getStringList("socialspy-commands")) { socialspyCommands.add(c.toLowerCase(Locale.ENGLISH)); |