From a58320a5f3312e756c66fac3402d8983359968c2 Mon Sep 17 00:00:00 2001 From: Trent Hensler Date: Fri, 6 Apr 2018 15:48:21 -0700 Subject: [PATCH] Only charge in one spot for vaults --- pom.xml | 2 +- .../com/drtshock/playervaults/commands/VaultCommand.java | 2 +- .../playervaults/vaultmanagement/VaultManager.java | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 33cfeb1..a379c7a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.drtshock PlayerVaultsX - 4.0.4 + 4.0.5-SNAPSHOT PlayerVaultsX http://dev.bukkit.org/pancakes/playervaults/ diff --git a/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java b/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java index 4e00a32..7b40815 100644 --- a/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java +++ b/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java @@ -32,7 +32,7 @@ public class VaultCommand implements CommandExecutor { switch (args.length) { case 1: - if (VaultOperations.openOwnVault(player, args[0], true)) { + if (VaultOperations.openOwnVault(player, args[0])) { PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(player.getUniqueId(), Integer.parseInt(args[0]))); } else if (sender.hasPermission("playervaults.admin")) { OfflinePlayer searchPlayer = Bukkit.getOfflinePlayer(args[0]); diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java index bd96c56..dee5e99 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java @@ -66,13 +66,8 @@ public class VaultManager { YamlConfiguration playerFile = getPlayerVaultFile(player.getUniqueId()); VaultHolder vaultHolder = new VaultHolder(number); if (playerFile.getString(String.format(VAULTKEY, number)) == null) { - if (EconomyOperations.payToCreate(player)) { - inv = Bukkit.createInventory(vaultHolder, size, title); - vaultHolder.setInventory(inv); - } else { - player.sendMessage(Lang.TITLE.toString() + Lang.INSUFFICIENT_FUNDS.toString()); - return null; - } + inv = Bukkit.createInventory(vaultHolder, size, title); + vaultHolder.setInventory(inv); } else { Inventory i = getInventory(vaultHolder, playerFile, size, number, title); if (i == null) {