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

Merge branch 'master' of git@github.com:graywolf336/Jail.git

Browse Source
This commit is contained in:
graywolf336 2014-04-21 22:04:23 -05:00
commit 3ad2eb26af
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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. */

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

@ -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.");
}
}