From cecfb8371db4dc80d16c46161fe766400ed89cb1 Mon Sep 17 00:00:00 2001 From: gomeow Date: Tue, 19 Mar 2013 21:14:38 -0700 Subject: [PATCH] Small cleanup --- .../java/com/drtshock/playervaults/util/Serialization.java | 5 ++--- .../java/com/drtshock/playervaults/util/VaultManager.java | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/util/Serialization.java b/src/main/java/com/drtshock/playervaults/util/Serialization.java index caaf3ca..e6b18f3 100644 --- a/src/main/java/com/drtshock/playervaults/util/Serialization.java +++ b/src/main/java/com/drtshock/playervaults/util/Serialization.java @@ -41,11 +41,10 @@ public class Serialization { return Base64Coder.encodeLines(outputStream.toByteArray()); } - public static Inventory fromBase64(String data) { + public static Inventory fromBase64(String data, int number) { ByteArrayInputStream inputStream = new ByteArrayInputStream(Base64Coder.decodeLines(data)); NBTTagList itemList = (NBTTagList) NBTBase.b(new DataInputStream(inputStream)); - Inventory inventory = new CraftInventoryCustom(null, itemList.size(), ChatColor.DARK_RED + "Vault"); - + Inventory inventory = new CraftInventoryCustom(null, itemList.size(), ChatColor.DARK_RED + "Vault #" + String.valueOf(number)); for (int i = 0; i < itemList.size(); i++) { NBTTagCompound inputObject = (NBTTagCompound) itemList.get(i); diff --git a/src/main/java/com/drtshock/playervaults/util/VaultManager.java b/src/main/java/com/drtshock/playervaults/util/VaultManager.java index 5573c97..742cc04 100644 --- a/src/main/java/com/drtshock/playervaults/util/VaultManager.java +++ b/src/main/java/com/drtshock/playervaults/util/VaultManager.java @@ -42,15 +42,14 @@ public class VaultManager { * * TODO: Check to see if the path exists before we get it! */ - public void loadVault(Player sender, String holder, int number) { + public void loadVault(Player player, String holder, int number) { YamlConfiguration playerFile = playerVaultFile(holder); String data = playerFile.getString("vault" + number); - Player player = (Player) sender; if(data == null) { Inventory inv = Bukkit.createInventory(player, 54, ChatColor.DARK_RED + "Vault #" + String.valueOf(number)); player.openInventory(inv); } else { - Inventory inv = Serialization.fromBase64(data); + Inventory inv = Serialization.fromBase64(data, number); player.openInventory(inv); } } @@ -66,7 +65,7 @@ public class VaultManager { YamlConfiguration playerFile = playerVaultFile(player.getName()); String data = playerFile.getString("vault" + number); if(data == null) { - Inventory inv = Bukkit.createInventory(player, 54, ChatColor.DARK_RED + "Vault #" + String.valueOf(number)); + Inventory inv = Bukkit.createInventory(player, 54, ChatColor.GREEN + "Vault #" + String.valueOf(number)); return inv; } else { Inventory inv = Serialization.fromBase64(data);