From 1ee0cc7db7dae395c252405cbc066fb742419319 Mon Sep 17 00:00:00 2001
From: Trent Hensler <thensler@wisc.edu>
Date: Thu, 14 Feb 2013 14:45:22 -0600
Subject: [PATCH] Probably messed things up.

---
 .../shock/playervaults/commands/Feedback.java | 13 ----------
 .../shock/playervaults/commands/OwnVault.java | 24 ++++++++++++-------
 .../shock/playervaults/util/VaultManager.java | 10 ++++++++
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/me/shock/playervaults/commands/Feedback.java b/src/me/shock/playervaults/commands/Feedback.java
index 269bb27..4d6f51d 100644
--- a/src/me/shock/playervaults/commands/Feedback.java
+++ b/src/me/shock/playervaults/commands/Feedback.java
@@ -1,15 +1,10 @@
 package me.shock.playervaults.commands;
 
-import me.shock.playervaults.Main;
-
 import org.bukkit.ChatColor;
-import org.bukkit.World;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class Feedback {
 	
-	private static Main main;
 	static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + 
 			ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
 	
@@ -28,12 +23,4 @@ public class Feedback {
 		sender.sendMessage(pv + "You can't use this in that world!");
 		return;
 	}
-	
-	
-	public static boolean allowedWorld(Player player) {
-		World world = player.getWorld();
-		if(main.disabledWorlds().contains(world))
-			return false;
-		return true;
-	}
 }
diff --git a/src/me/shock/playervaults/commands/OwnVault.java b/src/me/shock/playervaults/commands/OwnVault.java
index 6dc76e0..dad1345 100644
--- a/src/me/shock/playervaults/commands/OwnVault.java
+++ b/src/me/shock/playervaults/commands/OwnVault.java
@@ -4,13 +4,14 @@ import me.shock.playervaults.Main;
 import me.shock.playervaults.util.VaultManager;
 
 import org.bukkit.ChatColor;
+import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 public class OwnVault {
 
-	private static Main main;
-	private static VaultManager vm = new VaultManager(main);
+	private static Main plugin;
+	private static VaultManager vm = new VaultManager(plugin);
 	static Feedback feedback = new Feedback();
 
 	static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + 
@@ -20,17 +21,22 @@ public class OwnVault {
 		if(arg0.matches("^[0-9]{1,2}$")) {
 			System.out.println("yay regex!");
 			if(sender.hasPermission("playervaults.amount." + arg0)) {
-				if(Feedback.allowedWorld((Player) sender)) {
-					int number = Integer.parseInt(arg0);
-					vm.loadVault(sender, sender.getName(), number);
-					sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number);
-					return true;
-				} else
-					return false;
+				int number = Integer.parseInt(arg0);
+				vm.loadVault(sender, sender.getName(), number);
+				sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number);
+				return true;
 			} else {
 				feedback.noPerms(sender);
 			}
 		}
 		return false;
 	}
+
+	@SuppressWarnings("unused")
+	private static boolean allowedWorld(Player player) {
+		World world = player.getWorld();
+		if(plugin.disabledWorlds().contains(world))
+			return false;
+		return true;
+	}
 }
diff --git a/src/me/shock/playervaults/util/VaultManager.java b/src/me/shock/playervaults/util/VaultManager.java
index 8da559d..0f9d14e 100644
--- a/src/me/shock/playervaults/util/VaultManager.java
+++ b/src/me/shock/playervaults/util/VaultManager.java
@@ -40,7 +40,10 @@ public class VaultManager {
 			YamlConfiguration file = playerVaultFile(player.getName());
 			System.out.println("serial: " + ser);
 			// Prepare to save D:
+			file.createSection("vault" + number);
 			file.set("vault" + number + "", ser);
+			saveFile(player.getName());
+			Commands.inVault.remove(player.getName());
 		}
 	}
 
@@ -97,4 +100,11 @@ public class VaultManager {
 		YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
 		return playerFile;
 	}
+	
+	public void saveFile(String name) throws IOException {
+		File file = new File(directory + File.separator + name.toLowerCase() + ".yml");
+		YamlConfiguration yaml = YamlConfiguration.loadConfiguration(file);
+		yaml.save(file);
+		return;
+	}
 }