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

Added negated node support for DinnerPerms lookup.

Browse Source
This commit is contained in:
zml2008 2011-10-03 22:05:32 -07:00
parent bb609a47c2
commit 9e877740aa
1 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,8 @@
package com.sk89q.bukkit.migration; package com.sk89q.bukkit.migration;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.permissions.PermissionAttachmentInfo;
import java.util.ArrayList; import java.util.ArrayList;
@ -45,25 +46,34 @@ public class DinnerPermsResolver implements PermissionsResolver {
} }
public void load() { public void load() {
// Permissions are already loaded
} }
public boolean hasPermission(String name, String permission) { public boolean hasPermission(String name, String permission) {
Player player = server.getPlayerExact(name); Permissible perms = server.getPlayerExact(name);
if (player == null) { if (perms == null) {
return false; // Permissions are only registered for online players return false; // Permissions are only registered for online players
} }
if (player.hasPermission("*") || player.hasPermission(permission)) { switch (internalHasPermission(perms, permission)) {
case 0:
break;
case -1:
return false;
case 1:
return true; return true;
} }
int dotPos = permission.lastIndexOf("."); int dotPos = permission.lastIndexOf(".");
while (dotPos > -1) { while (dotPos > -1) {
if (player.hasPermission(permission.substring(0, dotPos + 1) + "*")) { switch (internalHasPermission(perms, permission.substring(0, dotPos + 1) + "*")) {
case 0:
break;
case -1:
return false;
case 1:
return true; return true;
} }
dotPos = permission.lastIndexOf(".", dotPos - 1); dotPos = permission.lastIndexOf(".", dotPos - 1);
} }
return false; return internalHasPermission(perms, "*") == 1;
} }
public boolean hasPermission(String worldName, String name, String permission) { public boolean hasPermission(String worldName, String name, String permission) {
@ -71,20 +81,20 @@ public class DinnerPermsResolver implements PermissionsResolver {
} }
public boolean inGroup(String name, String group) { public boolean inGroup(String name, String group) {
Player player = server.getPlayer(name); Permissible perms = server.getPlayerExact(name);
if (player == null) { if (perms == null) {
return false; return false;
} }
return player.hasPermission(GROUP_PREFIX + group); return perms.hasPermission(GROUP_PREFIX + group);
} }
public String[] getGroups(String name) { public String[] getGroups(String name) {
Player player = server.getPlayer(name); Permissible perms = server.getPlayerExact(name);
if (player == null) { if (perms == null) {
return new String[0]; return new String[0];
} }
List<String> groupNames = new ArrayList<String>(); List<String> groupNames = new ArrayList<String>();
for (PermissionAttachmentInfo permAttach : player.getEffectivePermissions()) { for (PermissionAttachmentInfo permAttach : perms.getEffectivePermissions()) {
String perm = permAttach.getPermission(); String perm = permAttach.getPermission();
if (!(perm.startsWith(GROUP_PREFIX) && permAttach.getValue())) { if (!(perm.startsWith(GROUP_PREFIX) && permAttach.getValue())) {
continue; continue;
@ -94,8 +104,28 @@ public class DinnerPermsResolver implements PermissionsResolver {
return groupNames.toArray(new String[groupNames.size()]); return groupNames.toArray(new String[groupNames.size()]);
} }
/**
* Checks the permission from dinnerperms
* @param perms Permissible to check for
* @param permission The permission to check
* @return -1 if the permission is explicitly denied, 1 if the permission is allowed,
* 0 if the permission is denied by a default.
*/
public int internalHasPermission(Permissible perms, String permission) {
if (perms.isPermissionSet(permission)) {
return perms.hasPermission(permission) ? 1 : -1;
} else {
Permission perm = server.getPluginManager().getPermission(permission);
if (perm != null) {
return perm.getDefault().getValue(perms.isOp()) ? 1 : 0;
} else {
return 0;
}
}
}
public String getDetectionMessage() { public String getDetectionMessage() {
return "Using the Bukkit Permissions API."; return "Using the Bukkit Permissions API.";
} }
} }