Only initialize JailPayManager if vault exists.
This commit is contained in:
		@@ -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. */
 | 
			
		||||
 
 | 
			
		||||
@@ -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.");
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
@@ -162,7 +161,6 @@ public class JailPayManager {
 | 
			
		||||
	
 | 
			
		||||
	private boolean setupEconomy(JailMain plugin) {
 | 
			
		||||
		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);
 | 
			
		||||
        if (economyProvider != null) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user