VaultManager won't read playerfile

This commit is contained in:
Trent Hensler
2013-02-07 01:03:22 -06:00
parent 1f66b305f9
commit c8e05e5e85
4 changed files with 19 additions and 27 deletions
+3 -2
View File
@@ -14,7 +14,8 @@ import org.bukkit.entity.Player;
public class Commands implements CommandExecutor public class Commands implements CommandExecutor
{ {
VaultManager vm = new VaultManager(); private Main plugin;
VaultManager vm = new VaultManager(plugin);
String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" +
ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
@@ -23,7 +24,7 @@ public class Commands implements CommandExecutor
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args)
{ {
if (cmd.getName().equalsIgnoreCase("vault")) if (cmd.getName().equalsIgnoreCase("pv"))
{ {
if (!(sender instanceof Player)) if (!(sender instanceof Player))
{ {
+2 -2
View File
@@ -31,7 +31,7 @@ public class Listeners implements Listener
{ {
this.plugin = instance; this.plugin = instance;
} }
VaultManager vm = new VaultManager(); VaultManager vm = new VaultManager(plugin);
Commands commands = new Commands(); Commands commands = new Commands();
@@ -54,7 +54,7 @@ public class Listeners implements Listener
public void onJoin(PlayerJoinEvent event) public void onJoin(PlayerJoinEvent event)
{ {
Player player = event.getPlayer(); Player player = event.getPlayer();
plugin.playerVaultFile(player); plugin.playerVaultFile(player.getName());
if(player.isOp() && Main.update) if(player.isOp() && Main.update)
{ {
player.sendMessage(ChatColor.GREEN + "Version " + Main.name + " of PlayerVaults is up for download!"); player.sendMessage(ChatColor.GREEN + "Version " + Main.name + " of PlayerVaults is up for download!");
+2 -3
View File
@@ -15,7 +15,6 @@ import me.shock.playervaults.util.Updater;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.craftbukkit.libs.jline.internal.Log; import org.bukkit.craftbukkit.libs.jline.internal.Log;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@@ -141,12 +140,12 @@ public class Main extends JavaPlugin {
return lang; return lang;
} }
public YamlConfiguration playerVaultFile(Player player) { public YamlConfiguration playerVaultFile(String player) {
File folder = new File(getDataFolder() + File.separator + "vaults"); File folder = new File(getDataFolder() + File.separator + "vaults");
if(!folder.exists()) { if(!folder.exists()) {
folder.mkdir(); folder.mkdir();
} }
File file = new File(getDataFolder() + File.separator + "vaults" + File.separator + player.getName().toLowerCase() + ".yml"); File file = new File(getDataFolder() + File.separator + "vaults" + File.separator + player.toLowerCase() + ".yml");
if(!file.exists()) { if(!file.exists()) {
try { try {
file.createNewFile(); file.createNewFile();
@@ -17,7 +17,10 @@ import org.bukkit.inventory.Inventory;
public class VaultManager public class VaultManager
{ {
private Main plugin; public Main plugin;
public VaultManager(Main instance) {
this.plugin = instance;
}
String title; String title;
/** /**
@@ -33,7 +36,7 @@ public class VaultManager
{ {
// Get the player's file and serialize the inventory. // Get the player's file and serialize the inventory.
String ser = Serialization.toBase64(inv); String ser = Serialization.toBase64(inv);
YamlConfiguration file = plugin.playerVaultFile(player); YamlConfiguration file = plugin.playerVaultFile(player.getName());
// Prepare to save D: // Prepare to save D:
file.set("vault" + number + "", ser); file.set("vault" + number + "", ser);
@@ -52,11 +55,7 @@ public class VaultManager
*/ */
public void loadVault(CommandSender sender, String target, int number) public void loadVault(CommandSender sender, String target, int number)
{ {
String name = target.toLowerCase(); YamlConfiguration playerFile = plugin.playerVaultFile(target);
File file = new File(plugin.getDataFolder() + File.separator + "vaults" + name + ".yml");
FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
if(file.exists())
{
String data = playerFile.getString("vault" + "" + number + ""); String data = playerFile.getString("vault" + "" + number + "");
Inventory inv = Serialization.fromBase64(data); Inventory inv = Serialization.fromBase64(data);
Player player = (Player) sender; Player player = (Player) sender;
@@ -64,13 +63,6 @@ public class VaultManager
player.sendMessage(title + " Opening " + ChatColor.GREEN + " " + number); player.sendMessage(title + " Opening " + ChatColor.GREEN + " " + number);
return; return;
}
else
{
sender.sendMessage(title + " That doesn't exist!");
return;
}
} }
public void deleteVault(CommandSender sender, String target, int number) throws IOException public void deleteVault(CommandSender sender, String target, int number) throws IOException