From ab9919071ae200b295ba5db43ea08383135e2123 Mon Sep 17 00:00:00 2001 From: CmdrKittens <52665651+CmdrKittens@users.noreply.github.com> Date: Thu, 9 Apr 2020 10:50:46 -0400 Subject: [PATCH] Don't charge players for costs of zero --- .../playervaults/vaultmanagement/EconomyOperations.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java index bb6a558..e37703c 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java @@ -22,7 +22,6 @@ import com.drtshock.playervaults.PlayerVaults; import com.drtshock.playervaults.translations.Lang; import net.milkbowl.vault.economy.EconomyResponse; import org.bukkit.ChatColor; -import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; @@ -48,6 +47,9 @@ public class EconomyOperations { if (!VaultManager.getInstance().vaultExists(player.getUniqueId().toString(), number)) { return payToCreate(player); } else { + if (PlayerVaults.getInstance().getConf().getEconomy().getFeeToOpen() == 0) { + return true; + } double cost = PlayerVaults.getInstance().getConf().getEconomy().getFeeToOpen(); EconomyResponse resp = PlayerVaults.getInstance().getEconomy().withdrawPlayer(player, cost); if (resp.transactionSuccess()) { @@ -66,7 +68,7 @@ public class EconomyOperations { * @return The transaction success */ public static boolean payToCreate(Player player) { - if (!PlayerVaults.getInstance().isEconomyEnabled() || player.hasPermission("playervaults.free")) { + if (!PlayerVaults.getInstance().isEconomyEnabled() || PlayerVaults.getInstance().getConf().getEconomy().getFeeToCreate() == 0 || player.hasPermission("playervaults.free")) { return true; } @@ -88,7 +90,7 @@ public class EconomyOperations { * @return The transaction success. */ public static boolean refundOnDelete(Player player, int number) { - if (!PlayerVaults.getInstance().isEconomyEnabled() || player.hasPermission("playervaults.free")) { + if (!PlayerVaults.getInstance().isEconomyEnabled() || PlayerVaults.getInstance().getConf().getEconomy().getRefundOnDelete() == 0 || player.hasPermission("playervaults.free")) { return true; }