summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java13
2 files changed, 7 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 756ab4440..c1c78f213 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,6 @@
/EssentialsUpdate/dist/
/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 00e973dcf..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,13 +56,9 @@ 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))
+ if (user.isAuthorized("essentials.sethome.multiple." + set) && (limit < getHomeLimit(set)))
{
- logger.log(Level.INFO, "Found permission for set: " + set);
- if (limit < getHomeLimit(set)) {
- limit = getHomeLimit(set);
- }
+ limit = getHomeLimit(set);
}
}
return limit;
@@ -70,8 +66,7 @@ public class Settings implements ISettings
@Override
public int getHomeLimit(final String set)
- {
- logger.log(Level.INFO, "Checking limit for: " + set);
+ {
return config.getInt("sethome-multiple." + set, config.getInt("sethome-multiple.default", 3));
}