Merge pull request #227 from Elvaron/2.9

FallBack for missing config property
This commit is contained in:
KHobbits 2012-12-20 15:36:01 -08:00
commit a1c88a140e

View File

@ -243,6 +243,11 @@ public class Settings implements ISettings
public Set<String> _getSocialSpyCommands() public Set<String> _getSocialSpyCommands()
{ {
Set<String> socialspyCommands = new HashSet<String>(); 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")) for (String c : config.getStringList("socialspy-commands"))
{ {
socialspyCommands.add(c.toLowerCase(Locale.ENGLISH)); socialspyCommands.add(c.toLowerCase(Locale.ENGLISH));