Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-02-17 20:31:37 +01:00
Code Issues Projects Releases Wiki Activity

Straighten out GroupManager offline permissions

Browse Source
This commit is contained in:
Mike Primm 2013-07-18 08:44:33 -05:00
parent f0f881d126
commit 1793d910d4
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -748,12 +748,12 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
permissions = PEXPermissions.create(getServer(), "dynmap"); permissions = PEXPermissions.create(getServer(), "dynmap");
if (permissions == null) if (permissions == null)
permissions = bPermPermissions.create(getServer(), "dynmap", perdefs); permissions = bPermPermissions.create(getServer(), "dynmap", perdefs);
if (permissions == null)
permissions = GroupManagerPermissions.create(getServer(), "dynmap");
if (permissions == null) if (permissions == null)
permissions = PermBukkitPermissions.create(getServer(), "dynmap", perdefs); permissions = PermBukkitPermissions.create(getServer(), "dynmap", perdefs);
if (permissions == null) if (permissions == null)
permissions = NijikokunPermissions.create(getServer(), "dynmap"); permissions = NijikokunPermissions.create(getServer(), "dynmap");
if (permissions == null)
permissions = GroupManagerPermissions.create(getServer(), "dynmap");
if (permissions == null) if (permissions == null)
permissions = BukkitPermissions.create("dynmap", perdefs); permissions = BukkitPermissions.create("dynmap", perdefs);
if (permissions == null) if (permissions == null)

12
src/main/java/org/dynmap/bukkit/permissions/GroupManagerPermissions.java
View File

@ -37,13 +37,14 @@ public class GroupManagerPermissions implements PermissionProvider {
@Override @Override
public boolean has(CommandSender sender, String permission) { public boolean has(CommandSender sender, String permission) {
Player player = sender instanceof Player ? (Player) sender : null; Player player = sender instanceof Player ? (Player) sender : null;
return (player != null) ? wh.getWorldPermissions(player).has(player, name + "." + permission) : true; boolean rslt = (player != null) ? gm.getWorldsHolder().getDefaultWorld().getPermissionsHandler().permission(player, name + "." + permission) : true;
return rslt;
} }
@Override @Override
public Set<String> hasOfflinePermissions(String player, Set<String> perms) { public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
HashSet<String> hasperms = new HashSet<String>(); HashSet<String> hasperms = new HashSet<String>();
AnjoPermissionsHandler apm = wh.getWorldPermissionsByPlayerName(player); AnjoPermissionsHandler apm = gm.getWorldsHolder().getDefaultWorld().getPermissionsHandler();
if (apm != null) { if (apm != null) {
for (String pp : perms) { for (String pp : perms) {
if (apm.permission(player, name + "." + pp)) { if (apm.permission(player, name + "." + pp)) {
@ -55,10 +56,11 @@ public class GroupManagerPermissions implements PermissionProvider {
} }
@Override @Override
public boolean hasOfflinePermission(String player, String perm) { public boolean hasOfflinePermission(String player, String perm) {
AnjoPermissionsHandler apm = wh.getWorldPermissionsByPlayerName(player); AnjoPermissionsHandler apm = gm.getWorldsHolder().getDefaultWorld().getPermissionsHandler();
boolean rslt = false;
if(apm != null) { if(apm != null) {
return apm.permission(player, name + "." + perm); rslt = apm.permission(player, name + "." + perm);
} }
return false; return rslt;
} }
} }

5
src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java
View File

@ -24,8 +24,9 @@ public class PEXPermissions implements PermissionProvider {
server.getPluginManager().enablePlugin(permissionsPlugin); server.getPluginManager().enablePlugin(permissionsPlugin);
if(permissionsPlugin.isEnabled() == false) if(permissionsPlugin.isEnabled() == false)
return null; return null;
if(PermissionsEx.isAvailable() == false) //Broken in new dev builds, apparently
return null; //if(PermissionsEx.isAvailable() == false)
// return null;
Log.info("Using PermissionsEx " + permissionsPlugin.getDescription().getVersion() + " for access control"); Log.info("Using PermissionsEx " + permissionsPlugin.getDescription().getVersion() + " for access control");
return new PEXPermissions(name); return new PEXPermissions(name);
} }