Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removing debugging.

This commit is contained in:
KHobbits 2011-10-18 02:21:26 +01:00
parent 7c5674c294
commit 27a0552c2a
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -35,3 +35,6 @@
/EssentialsUpdate/dist/
/EssentialsUpdate/build/
/WebPush/apikey.php
/WebPush/apikey.php
/WebPush/apikey.php

13
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -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));
}