Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dinnerperms wildcard matching & group enumeration.

Browse Source
This commit is contained in:
ZerothAngel 2011-09-04 16:21:49 -07:00 committed by zml2008
parent 6f1d263e16
commit 703131107d
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/sk89q/bukkit/migration/DinnerPermsResolver.java
View File

@ -26,16 +26,11 @@ public class DinnerPermsResolver implements PermissionsResolver {
return false; // Permissions are only registered for online players return false; // Permissions are only registered for online players
if ( player.hasPermission("*") || player.hasPermission(permission)) if ( player.hasPermission("*") || player.hasPermission(permission))
return true; return true;
int i = 0; int dotPos = permission.lastIndexOf(".");
while (i <= permission.length() + 1) { while (dotPos > -1) {
int dotPos = permission.indexOf(".", i); if (player.hasPermission(permission.substring(0, dotPos + 1) + "*"))
if (dotPos > -1) { return true;
if (player.hasPermission(permission.substring(0, dotPos + 1) + "*")) dotPos = permission.lastIndexOf(".", dotPos - 1);
return true;
i += dotPos;
} else {
break;
}
} }
return false; return false;
} }
@ -58,10 +53,10 @@ public class DinnerPermsResolver implements PermissionsResolver {
List<String> groupNames = new ArrayList<String>(); List<String> groupNames = new ArrayList<String>();
for (PermissionAttachmentInfo permAttach : player.getEffectivePermissions()) { for (PermissionAttachmentInfo permAttach : player.getEffectivePermissions()) {
String perm = permAttach.getPermission(); String perm = permAttach.getPermission();
if (!perm.startsWith(GROUP_PREFIX)) if (!(perm.startsWith(GROUP_PREFIX) || permAttach.getValue()))
continue; continue;
groupNames.add(perm.substring(GROUP_PREFIX.length(), perm.length())); groupNames.add(perm.substring(GROUP_PREFIX.length(), perm.length()));
} }
return groupNames.toArray(new String[groupNames.size()]); return groupNames.toArray(new String[0]);
} }
} }