diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Settings.java | 7 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandban.java | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 763785783..c1c78f213 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,8 @@ /EssentialsUpdate/nbproject/private/ /EssentialsRelease/ /EssentialsUpdate/dist/ -/EssentialsUpdate/build/
\ No newline at end of file +/EssentialsUpdate/build/ +/WebPush/apikey.php + +/WebPush/apikey.php +/WebPush/apikey.php
\ No newline at end of file diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index 9d11d675b..e59c3c2b2 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -46,7 +46,7 @@ public class Settings implements ISettings @Override public int getHomeLimit(final User user) { - final List<String> homeList = getMultipleHomes(); + final List<String> homeList = getMultipleHomes(); if (homeList == null) { //TODO: Replace this code to remove backwards compat, after settings are automatically updated @@ -56,8 +56,7 @@ public class Settings implements ISettings int limit = getHomeLimit("default"); for (String set : homeList) { - logger.log(Level.INFO, "Found home set: " + set); - if (user.hasPermission("essentials.sethome.multiple." + set) && limit < getHomeLimit(set)) + if (user.isAuthorized("essentials.sethome.multiple." + set) && (limit < getHomeLimit(set))) { limit = getHomeLimit(set); } @@ -67,7 +66,7 @@ public class Settings implements ISettings @Override public int getHomeLimit(final String set) - { + { return config.getInt("sethome-multiple." + set, config.getInt("sethome-multiple.default", 3)); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/com/earth2me/essentials/commands/Commandban.java index d6387c074..a4a5e2839 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandban.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandban.java @@ -46,7 +46,7 @@ public class Commandban extends EssentialsCommand if (args.length > 1) { banReason = getFinalArg(args, 1); - player.setBanReason(commandLabel); + player.setBanReason(banReason); } else { |