1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-06-05 19:05:06 +02:00

Prevent GM's own permission tests from allowing inherited permissions to override inherited negations (caused when we added the exception override for sub groups).

This commit is contained in:
ElgarL 2014-05-28 02:03:51 +01:00
parent f03e41536b
commit 34a323125f
2 changed files with 7 additions and 4 deletions

View File

@ -231,4 +231,5 @@ v2.1:
- Set a default mirror map if none is found in the config. - Set a default mirror map if none is found in the config.
- Fix clones forgetting sub groups. - Fix clones forgetting sub groups.
- Prevent players who have never logged in before from taking over existing accounts. - Prevent players who have never logged in before from taking over existing accounts.
- Added metrics. - Added metrics.
- Prevent GM's own permission tests from allowing inherited permissions to override inherited negations (caused when we added the exception override for sub groups).

View File

@ -1072,9 +1072,11 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
return resultNow; return resultNow;
} }
// Negation found so store for later if (!result.resultType.equals(PermissionCheckResult.Type.NEGATION)) {
// as we need to continue looking for an Exception. // No Negation found so store for later
result = resultNow; // as we need to continue looking for an Exception.
result = resultNow;
}
} }
for (String sonName : now.getInherits()) { for (String sonName : now.getInherits()) {