summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-01-20 23:04:43 +0000
committerKHobbits <rob@khobbits.co.uk>2012-01-20 23:04:43 +0000
commit8b3501353e08613af994692ba1372440c069c2be (patch)
tree3189ac3a027311a3554a3a2dfcab2adb24fd385d
parent801815d2ab8a8d943f3a50f2485e911c673434e8 (diff)
downloadEssentials-8b3501353e08613af994692ba1372440c069c2be.tar
Essentials-8b3501353e08613af994692ba1372440c069c2be.tar.gz
Essentials-8b3501353e08613af994692ba1372440c069c2be.tar.lz
Essentials-8b3501353e08613af994692ba1372440c069c2be.tar.xz
Essentials-8b3501353e08613af994692ba1372440c069c2be.zip
If vault throws an exception, it should not be enabled.
-rw-r--r--Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
index c7757f66b..3d66c2f02 100644
--- a/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
+++ b/Essentials/src/com/earth2me/essentials/register/payment/methods/VaultEco.java
@@ -121,8 +121,15 @@ public class VaultEco implements Method
@Override
public boolean isCompatible(Plugin plugin)
{
- RegisteredServiceProvider<Economy> ecoPlugin = plugin.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
- return plugin instanceof Vault && ecoPlugin != null && !ecoPlugin.getProvider().getName().equals("Essentials Economy");
+ try
+ {
+ RegisteredServiceProvider<Economy> ecoPlugin = plugin.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
+ return plugin instanceof Vault && ecoPlugin != null && !ecoPlugin.getProvider().getName().equals("Essentials Economy");
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
}
@Override