diff --git a/src/main/java/com/graywolf336/jail/JailMain.java b/src/main/java/com/graywolf336/jail/JailMain.java index ab2da76..b73e722 100644 --- a/src/main/java/com/graywolf336/jail/JailMain.java +++ b/src/main/java/com/graywolf336/jail/JailMain.java @@ -92,12 +92,7 @@ public class JailMain extends JavaPlugin { jt = new JailTimer(this); - try { - jpm = new JailPayManager(this); - } catch (Exception e) { - getLogger().severe(e.getMessage()); - jpm = null; - } + reloadJailPayManager(); sbm = new ScoreBoardManager(this); @@ -192,9 +187,17 @@ public class JailMain extends JavaPlugin { * * @throws Exception If we couldn't successfully create a new Jail Pay Manager instance. */ - public void reloadJailPayManager() throws Exception { + public void reloadJailPayManager() { this.jpm = null; - this.jpm = new JailPayManager(this); + + if(getConfig().getBoolean(Settings.JAILPAYENABLED.getPath())) { + if(getServer().getPluginManager().isPluginEnabled("Vault")) { + this.jpm = new JailPayManager(this); + }else { + getConfig().set(Settings.JAILPAYENABLED.getPath(), false); + getLogger().severe("Jail Pay couldn't find an economy, disabling Jail Pay."); + } + } } /** Gets the {@link HandCuffManager} instance. */ diff --git a/src/main/java/com/graywolf336/jail/JailPayManager.java b/src/main/java/com/graywolf336/jail/JailPayManager.java index a96ad11..550cf2a 100644 --- a/src/main/java/com/graywolf336/jail/JailPayManager.java +++ b/src/main/java/com/graywolf336/jail/JailPayManager.java @@ -16,7 +16,7 @@ public class JailPayManager { private Material item; private boolean infinite, timed; - public JailPayManager(JailMain plugin) throws Exception { + public JailPayManager(JailMain plugin) { this.item = Material.getMaterial(plugin.getConfig().getString(Settings.JAILPAYITEM.getPath().toUpperCase())); if(this.item == null) this.item = Material.AIR; @@ -25,7 +25,6 @@ public class JailPayManager { if(!this.usingItemsForPayment()) { if(!this.setupEconomy(plugin)) { plugin.getConfig().set(Settings.JAILPAYENABLED.getPath(), false); - throw new Exception("Jail Pay couldn't find an economy, disabling Jail Pay."); } }