Bug fixes

src/main/java/com/sk89q/bukkit/migration/DinnerPermsResolver.java

@@ -53,7 +53,7 @@ public class DinnerPermsResolver implements PermissionsResolver {
         List<String> groupNames = new ArrayList<String>();
         for (PermissionAttachmentInfo permAttach : player.getEffectivePermissions()) {
             String perm = permAttach.getPermission();
-            if (!(perm.startsWith(GROUP_PREFIX) || permAttach.getValue()))
+            if (!(perm.startsWith(GROUP_PREFIX) && permAttach.getValue()))
                 continue;
             groupNames.add(perm.substring(GROUP_PREFIX.length(), perm.length()));
         }

src/main/java/com/sk89q/bukkit/migration/PermissionsResolverManager.java

@@ -53,6 +53,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
 
     private Server server;
     private PermissionsResolver perms;
+    private PermissionsResolverServerListener listener;
     private Configuration permsConfig;
     private String name;
     private Logger logger;
@@ -72,7 +73,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
         this.name = name;
         this.logger = logger;
         new PermissionsResolverServerListener(this, plugin);
-        loadConfig(new File("wepif.yml")); // TODO: config migration, maybe
+        loadConfig(new File("wepif.yml"));
         findResolver();
     }
     public void findResolver() {
@@ -205,6 +206,14 @@ public class PermissionsResolverManager implements PermissionsResolver {
         }
         return isUpdated;
     }
+
+    boolean hasServerListener() {
+        return listener != null;
+    }
+
+    void setServerListener(PermissionsResolverServerListener listener) {
+        this.listener = listener;
+    }
     
     public static class MissingPluginException extends Exception {
         private static final long serialVersionUID = 7044832912491608706L;

src/main/java/com/sk89q/bukkit/migration/PermissionsResolverServerListener.java

@@ -36,7 +36,9 @@ public class PermissionsResolverServerListener extends ServerListener {
 
     public PermissionsResolverServerListener(PermissionsResolverManager manager, Plugin plugin) {
         this.manager = manager;
-        register(plugin);
+        if (!manager.hasServerListener()) {
+            register(plugin);
+        }
     }
     
     /**
@@ -82,5 +84,6 @@ public class PermissionsResolverServerListener extends ServerListener {
                 this, Priority.Normal, plugin);
         plugin.getServer().getPluginManager().registerEvent(Event.Type.PLUGIN_DISABLE,
                 this, Priority.Normal, plugin);
+        manager.setServerListener(this);
     }
 }

src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -135,9 +135,6 @@ public class WorldEditPlugin extends JavaPlugin {
     protected void registerEvents() {
         new WorldEditPlayerListener(this);
         new WorldEditCriticalPlayerListener(this);
-
-        // The permissions resolver has some hooks of its own
-        new PermissionsResolverServerListener(perms, this);
     }
 
     /**