mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2024-12-27 05:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup of WEPIF constructors

Browse Source
This commit is contained in:
zml2008 2011-09-07 17:56:23 -07:00
parent 703131107d
commit 6b3f19f857
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
private Logger logger; private Logger logger;
protected boolean ignoreNijiPermsBridges; protected boolean ignoreNijiPermsBridges;
@Deprecated
public PermissionsResolverManager(Configuration config, Server server, String name, Logger logger) { public PermissionsResolverManager(Configuration config, Server server, String name, Logger logger) {
this.server = server; this.server = server;
this.name = name; this.name = name;
@ -65,6 +66,15 @@ public PermissionsResolverManager(Configuration config, Server server, String na
loadConfig(new File("wepif.yml")); // TODO: config migration, maybe loadConfig(new File("wepif.yml")); // TODO: config migration, maybe
findResolver(); findResolver();
} }
public PermissionsResolverManager(Plugin plugin, String name, Logger logger) {
this.server = plugin.getServer();
this.name = name;
this.logger = logger;
new PermissionsResolverServerListener(this, plugin);
loadConfig(new File("wepif.yml")); // TODO: config migration, maybe
findResolver();
}
public void findResolver() { public void findResolver() {
if (tryPluginPermissionsResolver()) return; if (tryPluginPermissionsResolver()) return;
if (tryNijiPermissions()) return; if (tryNijiPermissions()) return;

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

@ -29,10 +29,16 @@
public class PermissionsResolverServerListener extends ServerListener { public class PermissionsResolverServerListener extends ServerListener {
private PermissionsResolverManager manager; private PermissionsResolverManager manager;
@Deprecated
public PermissionsResolverServerListener(PermissionsResolverManager manager) { public PermissionsResolverServerListener(PermissionsResolverManager manager) {
this.manager = manager; this.manager = manager;
} }
public PermissionsResolverServerListener(PermissionsResolverManager manager, Plugin plugin) {
this.manager = manager;
register(plugin);
}
/** /**
* Called when a plugin is enabled * Called when a plugin is enabled
* *

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

@ -87,8 +87,7 @@ public void onEnable() {
// Set up configuration and such, including the permissions // Set up configuration and such, including the permissions
// resolver // resolver
config = new BukkitConfiguration(getConfiguration(), logger); config = new BukkitConfiguration(getConfiguration(), logger);
perms = new PermissionsResolverManager( perms = new PermissionsResolverManager(this, "WorldEdit", logger);
getConfiguration(), getServer(), "WorldEdit", logger);
// Load the configuration // Load the configuration
loadConfiguration(); loadConfiguration();
@ -138,13 +137,13 @@ protected void registerEvents() {
new WorldEditCriticalPlayerListener(this); new WorldEditCriticalPlayerListener(this);
// The permissions resolver has some hooks of its own // The permissions resolver has some hooks of its own
(new PermissionsResolverServerListener(perms)).register(this); new PermissionsResolverServerListener(perms, this);
} }
/** /**
* Register an event. * Register an event.
* *
* @param type * @param typeName
* @param listener * @param listener
* @param priority * @param priority
*/ */
@ -160,7 +159,7 @@ public void registerEvent(String typeName, Listener listener, Priority priority)
/** /**
* Register an event at normal priority. * Register an event at normal priority.
* *
* @param type * @param typeName
* @param listener * @param listener
*/ */
public void registerEvent(String typeName, Listener listener) { public void registerEvent(String typeName, Listener listener) {