From bd03b36c0e555b8075c644c6b3d900646f440745 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Mon, 28 Nov 2011 00:06:23 +0800 Subject: [PATCH 1/3] Delay asking for PermissionHandler - might help PEX not freak out --- .../java/org/dynmap/permissions/NijikokunPermissions.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/dynmap/permissions/NijikokunPermissions.java b/src/main/java/org/dynmap/permissions/NijikokunPermissions.java index dade7c82..bf6ded94 100644 --- a/src/main/java/org/dynmap/permissions/NijikokunPermissions.java +++ b/src/main/java/org/dynmap/permissions/NijikokunPermissions.java @@ -12,11 +12,13 @@ import com.nijikokun.bukkit.Permissions.Permissions; public class NijikokunPermissions implements PermissionProvider { String name; PermissionHandler permissions; - + Plugin plugin; + public static NijikokunPermissions create(Server server, String name) { Plugin permissionsPlugin = server.getPluginManager().getPlugin("Permissions"); if (permissionsPlugin == null) return null; + server.getPluginManager().enablePlugin(permissionsPlugin); Log.info("Using Permissions " + permissionsPlugin.getDescription().getVersion() + " for access control"); return new NijikokunPermissions(permissionsPlugin, name); @@ -24,11 +26,13 @@ public class NijikokunPermissions implements PermissionProvider { public NijikokunPermissions(Plugin permissionsPlugin, String name) { this.name = name; - permissions = ((Permissions) permissionsPlugin).getHandler(); + plugin = permissionsPlugin; } @Override public boolean has(CommandSender sender, String permission) { + if(permissions == null) + permissions = ((Permissions)plugin).getHandler(); Player player = sender instanceof Player ? (Player) sender : null; return player != null ? permissions.has(player, name + "." + permission) || permissions.has(player, name + ".*") From 6dd4018011fae33fde1f94119d9d8bc1b1375ff9 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Mon, 28 Nov 2011 01:25:22 +0800 Subject: [PATCH 2/3] Try another update to see if PEX is appeased --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7340fc9f..ede9d6b3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -2,7 +2,7 @@ name: dynmap main: org.dynmap.DynmapPlugin version: "${project.version}" authors: [FrozenCow, mikeprimm] -softdepend: [Permissions,PermissionEx,bPermissions,PermissionsBukkit] +softdepend: [ Permissions, PermissionEx, bPermissions, PermissionsBukkit] commands: dynmap: description: Controls Dynmap. From ed4ea80f5ec4048559884e08395c210e070a06d1 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Mon, 28 Nov 2011 05:47:51 +0800 Subject: [PATCH 3/3] Switch maven shader from exclude to include - keep idiot maven from pulling in PEX from shared build server.... --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index dce7f8fa..8f719f01 100644 --- a/pom.xml +++ b/pom.xml @@ -53,10 +53,9 @@ - - org.bukkit:bukkit:jar:* - com.nijikokun.bukkit:Permissions:jar:* - + + org.dynmap:dynmap-api:jar:* +