Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-23 19:16:31 +01:00
Code Issues Projects Releases Wiki Activity

added reflected Register pass-through to Vault. please test.

Browse Source
This commit is contained in:
Sleaker 2012-01-15 17:10:53 -08:00
parent 319d1d4f49
commit e4896477c2
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/net/milkbowl/vault/Vault.java
View File

@ -19,6 +19,8 @@
package net.milkbowl.vault; package net.milkbowl.vault;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL; import java.net.URL;
import java.util.Collection; import java.util.Collection;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -66,6 +68,8 @@ import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event.Type; import org.bukkit.event.Event.Type;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerListener; import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.ServicePriority; import org.bukkit.plugin.ServicePriority;
import org.bukkit.plugin.ServicesManager; import org.bukkit.plugin.ServicesManager;
@ -75,6 +79,8 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import com.nijikokun.register.payment.Methods;
public class Vault extends JavaPlugin { public class Vault extends JavaPlugin {
private static final Logger log = Logger.getLogger("Minecraft"); private static final Logger log = Logger.getLogger("Minecraft");
@ -103,6 +109,7 @@ public class Vault extends JavaPlugin {
getCommand("vault-info").setExecutor(this); getCommand("vault-info").setExecutor(this);
getCommand("vault-reload").setExecutor(this); getCommand("vault-reload").setExecutor(this);
this.getServer().getPluginManager().registerEvent(Type.PLAYER_JOIN, new VaultPlayerListener(), Priority.Monitor, this); this.getServer().getPluginManager().registerEvent(Type.PLAYER_JOIN, new VaultPlayerListener(), Priority.Monitor, this);
this.getServer().getPluginManager().registerEvent(Type.PLUGIN_ENABLE, new VaultPluginListener(), Priority.Monitor, this);
// Schedule to check the version every 30 minutes for an update. This is to update the most recent // Schedule to check the version every 30 minutes for an update. This is to update the most recent
// version so if an admin reconnects they will be warned about newer versions. // version so if an admin reconnects they will be warned about newer versions.
@ -464,6 +471,36 @@ public class Vault extends JavaPlugin {
} }
} }
} }
public class VaultPluginListener extends ServerListener {
@Override
public void onPluginEnable(PluginEnableEvent event) {
if (event.getPlugin().getDescription().getName().equals("Register")) {
try {
Method m = Methods.class.getMethod("addMethod", Methods.class);
m.setAccessible(true);
m.invoke(null, "Vault", new net.milkbowl.vault.VaultEco());
if (!Methods.setPreferred("Vault")) {
log.info("Unable to hook register");
} else {
log.info("[Vault] - Successfully injected Vault methods into Register.");
}
} catch (SecurityException e) {
log.info("Unable to hook register");
} catch (NoSuchMethodException e) {
log.info("Unable to hook register");
} catch (IllegalArgumentException e) {
log.info("Unable to hook register");
} catch (IllegalAccessException e) {
log.info("Unable to hook register");
} catch (InvocationTargetException e) {
log.info("Unable to hook register");
}
}
}
}
} }

2
src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java
View File

@ -177,7 +177,7 @@ public class Permission_GroupManager extends Permission {
Group group = owh.getGroup(groupName); Group group = owh.getGroup(groupName);
if (group == null) if (group == null)
return false; return false;
group.removePermission(permission); group.removePermission(permission);
return true; return true;
} }