Fixed permission check when the permission in question isn't added to…

… the rank
PowerNetworkHub · Jan 16, 2022 · 4ad4f6c · 4ad4f6c
1 parent 116c81d
commit 4ad4f6c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/nl/svenar/PowerRanks/Data/PowerPermissibleBase.java b/src/main/java/nl/svenar/PowerRanks/Data/PowerPermissibleBase.java
@@ -48,10 +48,12 @@ public boolean hasPermission(String permission) {
 		boolean containsWildcard = false;
 		boolean checkedWildcard = false;
 		boolean disallowed = false;
+		boolean disallowedValid = false;
 
 		for (PRPermission prPermission : permissions) {
 			if (prPermission.getName().equals(permission)) {
 				disallowed = !prPermission.getValue();
+				disallowedValid = true;
 				break;
 			}
 		}
@@ -63,6 +65,7 @@ public boolean hasPermission(String permission) {
 				if (wildcardPermissions.contains(perm.getName())) {
 					containsWildcard = true;
 					disallowed = !perm.getValue();
+					disallowedValid = true;
 					break;
 				}
 			}
@@ -75,7 +78,8 @@ public boolean hasPermission(String permission) {
 			PowerRanksVerbose.log("hasPermission", "Permission: " + permission);
 			PowerRanksVerbose.log("hasPermission",
 					"Permissions: '" + String.join(", ", getAllPermissionsFormatted(permissions)) + "'");
-			PowerRanksVerbose.log("hasPermission", "Is Disallowed: " + disallowed);
+			PowerRanksVerbose.log("hasPermission",
+					"Is Disallowed: " + disallowed + " (Valid: " + disallowedValid + ")");
 			PowerRanksVerbose.log("hasPermission", "Has *: " + getAllPermissions(permissions).contains("*"));
 			PowerRanksVerbose.log("hasPermission", "Is Operator: " + player.isOp());
 			// PowerRanksVerbose.log("hasPermission", "Return #3: " +
@@ -92,13 +96,13 @@ public boolean hasPermission(String permission) {
 			return false;
 		}
 
-		if (getAllPermissions(permissions).contains("*") || player.isOp()) {
+		if (getAllowedPermissions(permissions).contains("*") || player.isOp()) {
 			return true;
 		}
 
 		try {
 			return super.hasPermission(permission) || getAllowedPermissions(permissions).contains(permission)
-					|| !disallowed;
+					|| (disallowedValid && !disallowed);
 		} catch (Exception e) {
 			return getAllowedPermissions(permissions).contains(permission);
 		}