From 5fe91c5abf698645a5191b47d3efc50764a577da Mon Sep 17 00:00:00 2001 From: drtshock Date: Tue, 19 Mar 2013 21:49:39 -0500 Subject: [PATCH] Fix NPE in econ if no econ plugin but usecon. --- src/main/java/com/drtshock/playervaults/Main.java | 2 ++ .../com/drtshock/playervaults/util/EconomyOperations.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/Main.java b/src/main/java/com/drtshock/playervaults/Main.java index a9d4050..6c2c7c6 100644 --- a/src/main/java/com/drtshock/playervaults/Main.java +++ b/src/main/java/com/drtshock/playervaults/Main.java @@ -28,6 +28,7 @@ public class Main extends JavaPlugin { public static Economy econ = null; public static boolean dropOnDeath = false; public static int inventoriesToDrop = 0; + public static boolean useVault = false; @Override public void onEnable() { @@ -96,6 +97,7 @@ public class Main extends JavaPlugin { return false; } econ = rsp.getProvider(); + useVault = true; return econ != null; } diff --git a/src/main/java/com/drtshock/playervaults/util/EconomyOperations.java b/src/main/java/com/drtshock/playervaults/util/EconomyOperations.java index c2dda9f..d9ae1a6 100644 --- a/src/main/java/com/drtshock/playervaults/util/EconomyOperations.java +++ b/src/main/java/com/drtshock/playervaults/util/EconomyOperations.java @@ -24,7 +24,7 @@ public class EconomyOperations { * @return transaction success */ public static boolean payToOpen(Player player) { - if(!config.getBoolean("economy.enabled") || player.hasPermission("playervaults.free")) + if(!config.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || !Main.useVault) return true; double cost = config.getDouble("economy.cost-to-open"); @@ -44,7 +44,7 @@ public class EconomyOperations { * @return transaction success */ public static boolean payToMake(Player player) { - if(!config.getBoolean("economy.enabled") || player.hasPermission("playervaults.free")) + if(!config.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || !Main.useVault) return true; double cost = config.getDouble("economy.cost-to-create"); @@ -64,7 +64,7 @@ public class EconomyOperations { * @return transaction success. */ public static boolean refundOnDelete(Player player) { - if(!config.getBoolean("economy.enabled") || player.hasPermission("playervaults.free")) + if(!config.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || !Main.useVault) return true; double cost = config.getDouble("economy.refund-on-delete");