EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Only initialize JailPayManager if vault exists.

Browse Source
This commit is contained in:
graywolf336
2014-04-01 23:21:24 -05:00
parent 45bd1776ee
commit caf4315d6c
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/graywolf336/jail/JailMain.java
View File

@@ -92,12 +92,7 @@ public class JailMain extends JavaPlugin {
jt = new JailTimer(this); jt = new JailTimer(this);
try { reloadJailPayManager();
jpm = new JailPayManager(this);
} catch (Exception e) {
getLogger().severe(e.getMessage());
jpm = null;
}
sbm = new ScoreBoardManager(this); 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. * @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 = null;
if(getConfig().getBoolean(Settings.JAILPAYENABLED.getPath())) {
if(getServer().getPluginManager().isPluginEnabled("Vault")) {
this.jpm = new JailPayManager(this); 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. */ /** Gets the {@link HandCuffManager} instance. */

4
src/main/java/com/graywolf336/jail/JailPayManager.java
View File

@@ -16,7 +16,7 @@ public class JailPayManager {
private Material item; private Material item;
private boolean infinite, timed; 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())); this.item = Material.getMaterial(plugin.getConfig().getString(Settings.JAILPAYITEM.getPath().toUpperCase()));
if(this.item == null) this.item = Material.AIR; if(this.item == null) this.item = Material.AIR;
@@ -25,7 +25,6 @@ public class JailPayManager {
if(!this.usingItemsForPayment()) { if(!this.usingItemsForPayment()) {
if(!this.setupEconomy(plugin)) { if(!this.setupEconomy(plugin)) {
plugin.getConfig().set(Settings.JAILPAYENABLED.getPath(), false); plugin.getConfig().set(Settings.JAILPAYENABLED.getPath(), false);
throw new Exception("Jail Pay couldn't find an economy, disabling Jail Pay.");
} }
} }
@@ -162,7 +161,6 @@ public class JailPayManager {
private boolean setupEconomy(JailMain plugin) { private boolean setupEconomy(JailMain plugin) {
if (economy != null) return true; if (economy != null) return true;
else if(!plugin.getServer().getPluginManager().isPluginEnabled("Vault")) return false;
RegisteredServiceProvider<Economy> economyProvider = plugin.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class); RegisteredServiceProvider<Economy> economyProvider = plugin.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
if (economyProvider != null) { if (economyProvider != null) {