Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't give default limit if they have another

Browse Source
This commit is contained in:
Jesse Boyd 2018-05-13 10:50:42 +10:00
parent 2a7e111f46
commit 3b5c1d1c8b
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/boydti/fawe/config/Settings.java
View File

@ -435,9 +435,13 @@ public class Settings extends Config {
} else { } else {
limit = new FaweLimit(); limit = new FaweLimit();
} }
Collection<String> keys = LIMITS.getSections(); ArrayList<String> keys = new ArrayList<>(LIMITS.getSections());
if (keys.remove("default")) keys.add("default");
boolean limitFound = false;
for (String key : keys) { for (String key : keys) {
if (key.equals("default") || (player != null && player.hasPermission("fawe.limit." + key))) { if ((player != null && player.hasPermission("fawe.limit." + key)) || (!limitFound && key.equals("default"))) {
limitFound = true;
LIMITS newLimit = LIMITS.get(key); LIMITS newLimit = LIMITS.get(key);
limit.MAX_ACTIONS = Math.max(limit.MAX_ACTIONS, newLimit.MAX_ACTIONS != -1 ? newLimit.MAX_ACTIONS : Integer.MAX_VALUE); limit.MAX_ACTIONS = Math.max(limit.MAX_ACTIONS, newLimit.MAX_ACTIONS != -1 ? newLimit.MAX_ACTIONS : Integer.MAX_VALUE);
limit.MAX_CHANGES = Math.max(limit.MAX_CHANGES, newLimit.MAX_CHANGES != -1 ? newLimit.MAX_CHANGES : Integer.MAX_VALUE); limit.MAX_CHANGES = Math.max(limit.MAX_CHANGES, newLimit.MAX_CHANGES != -1 ? newLimit.MAX_CHANGES : Integer.MAX_VALUE);