This commit is contained in:
TomyLobo
2011-11-23 02:29:48 +01:00
parent 1a57f6e95d
commit 7e13b60a51
161 changed files with 1433 additions and 1412 deletions

View File

@ -38,10 +38,10 @@ public class ConfigurationPermissionsResolver implements PermissionsResolver {
section.setProperty("permissions.groups.default.permissions", new String[] {
"worldedit.reload",
"worldedit.selection",
"worlds.creative.worldedit.region"});
section.setProperty("permissions.groups.admins.permissions", new String[] {"*"});
section.setProperty("permissions.users.sk89q.permissions", new String[] {"worldedit"});
section.setProperty("permissions.users.sk89q.groups", new String[] {"admins"});
"worlds.creative.worldedit.region" });
section.setProperty("permissions.groups.admins.permissions", new String[] { "*" });
section.setProperty("permissions.users.sk89q.permissions", new String[] { "worldedit" });
section.setProperty("permissions.users.sk89q.groups", new String[] { "admins" });
return section;
}

View File

@ -50,18 +50,18 @@ public class DinnerPermsResolver implements PermissionsResolver {
return false; // Permissions are only registered for online players
}
switch (internalHasPermission(perms, permission)) {
case -1:
return false;
case 1:
return true;
case -1:
return false;
case 1:
return true;
}
int dotPos = permission.lastIndexOf(".");
while (dotPos > -1) {
switch (internalHasPermission(perms, permission.substring(0, dotPos + 1) + "*")) {
case -1:
return false;
case 1:
return true;
case -1:
return false;
case 1:
return true;
}
dotPos = permission.lastIndexOf(".", dotPos - 1);
}
@ -115,7 +115,7 @@ public class DinnerPermsResolver implements PermissionsResolver {
}
}
}
public String getDetectionMessage() {
return "Using the Bukkit Permissions API.";
}

View File

@ -21,7 +21,10 @@ package com.sk89q.bukkit.migration;
public interface PermissionsProvider {
public boolean hasPermission(String name, String permission);
public boolean hasPermission(String worldName, String name, String permission);
public boolean inGroup(String player, String group);
public String[] getGroups(String player);
}

View File

@ -64,11 +64,11 @@ public class PermissionsResolverManager implements PermissionsResolver {
@SuppressWarnings("unchecked")
protected Class<? extends PermissionsResolver>[] availableResolvers = new Class[] {
PluginPermissionsResolver.class,
PermissionsExResolver.class,
NijiPermissionsResolver.class,
DinnerPermsResolver.class,
FlatFilePermissionsResolver.class
PluginPermissionsResolver.class,
PermissionsExResolver.class,
NijiPermissionsResolver.class,
DinnerPermsResolver.class,
FlatFilePermissionsResolver.class
};
@Deprecated
@ -167,8 +167,8 @@ public class PermissionsResolverManager implements PermissionsResolver {
}
if (!keys.contains("resolvers")) {
//List<String> resolverKeys = config.getKeys("resolvers");
List<String> resolvers = new ArrayList<String>();
//List<String> resolverKeys = config.getKeys("resolvers");
List<String> resolvers = new ArrayList<String>();
for (Class<?> clazz : availableResolvers) {
resolvers.add(clazz.getSimpleName());
}