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

Bug fixes

Browse Source
This commit is contained in:
zml2008 2011-09-09 15:10:25 -07:00
parent 6b3f19f857
commit c38a6b0677
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ public class DinnerPermsResolver implements PermissionsResolver {
List<String> groupNames = new ArrayList<String>(); List<String> groupNames = new ArrayList<String>();
for (PermissionAttachmentInfo permAttach : player.getEffectivePermissions()) { for (PermissionAttachmentInfo permAttach : player.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;
groupNames.add(perm.substring(GROUP_PREFIX.length(), perm.length())); groupNames.add(perm.substring(GROUP_PREFIX.length(), perm.length()));
} }

11
src/main/java/com/sk89q/bukkit/migration/PermissionsResolverManager.java
View File

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

5
src/main/java/com/sk89q/bukkit/migration/PermissionsResolverServerListener.java
View File

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

3
src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

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