cdanesi/PlayerVaults
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set vault holders

Browse Source
This commit is contained in:
Trent Hensler
2018-03-23 18:28:22 -07:00
parent 9b552eca10
commit b1033c77ad
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
+7 -5
View File
@@ -8,6 +8,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
@@ -63,8 +64,8 @@ public class VaultManager {
Inventory inv; Inventory inv;
YamlConfiguration playerFile = getPlayerVaultFile(player.getUniqueId()); YamlConfiguration playerFile = getPlayerVaultFile(player.getUniqueId());
VaultHolder vaultHolder = new VaultHolder(number);
if (playerFile.getString(String.format(VAULTKEY, number)) == null) { if (playerFile.getString(String.format(VAULTKEY, number)) == null) {
VaultHolder vaultHolder = new VaultHolder(number);
if (EconomyOperations.payToCreate(player)) { if (EconomyOperations.payToCreate(player)) {
inv = Bukkit.createInventory(vaultHolder, size, title); inv = Bukkit.createInventory(vaultHolder, size, title);
vaultHolder.setInventory(inv); vaultHolder.setInventory(inv);
@@ -73,7 +74,7 @@ public class VaultManager {
return null; return null;
} }
} else { } else {
Inventory i = getInventory(playerFile, size, number, title); Inventory i = getInventory(vaultHolder, playerFile, size, number, title);
if (i == null) { if (i == null) {
return null; return null;
} else { } else {
@@ -105,11 +106,12 @@ public class VaultManager {
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", name); String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", name);
VaultViewInfo info = new VaultViewInfo(holder, number); VaultViewInfo info = new VaultViewInfo(holder, number);
Inventory inv; Inventory inv;
VaultHolder vaultHolder = new VaultHolder(number);
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) { if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString()); inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else { } else {
YamlConfiguration playerFile = getPlayerVaultFile(holder); YamlConfiguration playerFile = getPlayerVaultFile(holder);
Inventory i = getInventory(playerFile, size, number, title); Inventory i = getInventory(vaultHolder, playerFile, size, number, title);
if (i == null) { if (i == null) {
return null; return null;
} else { } else {
@@ -128,8 +130,8 @@ public class VaultManager {
* @param number the vault number. * @param number the vault number.
* @return inventory if exists, otherwise null. * @return inventory if exists, otherwise null.
*/ */
private Inventory getInventory(YamlConfiguration playerFile, int size, int number, String title) { private Inventory getInventory(InventoryHolder owner, YamlConfiguration playerFile, int size, int number, String title) {
Inventory inventory = Bukkit.createInventory(null, size, title); Inventory inventory = Bukkit.createInventory(owner, size, title);
String data = playerFile.getString(String.format(VAULTKEY, number)); String data = playerFile.getString(String.format(VAULTKEY, number));
Inventory deserialized = Base64Serialization.fromBase64(data); Inventory deserialized = Base64Serialization.fromBase64(data);