Update commands

Add delete other command.
Allow console to delete vaults.
Fix spacing :)

src/com/drtshock/playervaults/commands/Commands.java

@@ -36,18 +36,22 @@ public class Commands implements CommandExecutor {
 			}
 			else sender.sendMessage(pv + "Sorry but that can only be run by a player!");
 		}
+
 		else if(cmd.getName().equalsIgnoreCase("pvdel")) {
-			if(sender instanceof Player) {
+			switch(args.length) {
-				Player p = (Player) sender;
+			case 1:
-				switch(args.length) {
+				if(sender instanceof Player) {
-				case 1:
+					Player p = (Player) sender;
 					VaultOperations.deleteOwnVault(p, args[0]);
-					break;
-				default:
-					Feedback.showHelp(sender, Feedback.Type.DELETE);
 				}
+				else sender.sendMessage(pv + "Sorry but that can only be run by a player!");
+				break;
+			case 2:
+				VaultOperations.deleteOtherVault(sender, args[0], args[1]);
+				break;
+			default:
+				Feedback.showHelp(sender, Feedback.Type.DELETE);
 			}
-			else sender.sendMessage(pv + "Sorry but that can only be run by a player!");
 		}
 		return true;
 	}

src/com/drtshock/playervaults/commands/Feedback.java

@@ -2,7 +2,6 @@ package com.drtshock.playervaults.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 
 public class Feedback {
@@ -14,12 +13,12 @@ public class Feedback {
 	}
 	static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + 
 			ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
-	
+
 	public static void noPerms(CommandSender sender) {
 		sender.sendMessage(pv + "You don't have permission for that!");
 		return;
 	}
-	
+
 
 	public static void showHelp(CommandSender sender, Type t) {
 		if(t == Type.OPEN) {
@@ -31,9 +30,4 @@ public class Feedback {
 			sender.sendMessage(pv + "/pvdel <player> <number>");
 		}
 	}
-	
-	public static void badWorld(Player sender) {
-		sender.sendMessage(pv + "You can't use this in that world!");
-		return;
-	}
 }

src/com/drtshock/playervaults/commands/VaultOperations.java

@@ -4,7 +4,6 @@ import java.io.IOException;
 
 
 import org.bukkit.ChatColor;
-import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -19,44 +18,39 @@ public class VaultOperations {
 	static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + 
 			ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
 
-	
+
 	public static boolean checkPerms(CommandSender cs, int number) {
-		if(cs.hasPermission("playervaults.amount."+String.valueOf(number))) return true;
+		if(cs.hasPermission("playervaults.amount." + String.valueOf(number))) return true;
 		for(int x = number; x <= 99;x++) {
-			if(cs.hasPermission("playervaults.amount."+String.valueOf(x))) return true;
+			if(cs.hasPermission("playervaults.amount." + String.valueOf(x))) return true;
 		}
 		return false;
 	}
 	/*
-	 * TODO: Chenge how permissions are checked here.
+	 * TODO: Change how permissions are checked here.
 	 */
 	public static boolean openOwnVault(Player sender, String arg) {
-		if(allowedWorld(sender)) {
+		if(arg.matches("^[0-9]{1,2}$")) {
-			if(arg.matches("^[0-9]{1,2}$")) {
+			int number = 0;
-				int number = 0;
+			try {
-				try {
+				number = Integer.parseInt(arg);
-					number = Integer.parseInt(arg);
+			}
-				}
+			catch(NumberFormatException nfe) {
-				catch(NumberFormatException nfe) {
+				sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!");
-					sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!");
+				return false;
-					return false;
+			}
-				}
+			if(checkPerms(sender, number)) {
-				if(checkPerms(sender, number)) {
+				vm.loadVault(sender, sender.getName(), number);
-					vm.loadVault(sender, sender.getName(), number);
+				sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number);
-					sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number);
+				return true;
-					return true;
+			} else {
-				} else {
+				Feedback.noPerms(sender);
-					Feedback.noPerms(sender);
-				}
 			}
-		}
-		else {
-			Feedback.badWorld(sender);
 		}
 		return false;
 	}
-	
+
-	
+
 	public static boolean openOtherVault(Player sender, String user, String arg) {
 		if(sender.hasPermission("playervaults.admin")) {
 			if(arg.matches("^[0-9]{1,2}$")) {
@@ -65,7 +59,7 @@ public class VaultOperations {
 					number = Integer.parseInt(arg);
 				}
 				catch(NumberFormatException nfe) {
-					sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!");
+					sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!");
 				}
 				vm.loadVault(sender, user, number);
 				sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number);
@@ -74,7 +68,7 @@ public class VaultOperations {
 			else {
 				Feedback.noPerms(sender);
 			}
-	}
+		}
 		return false;
 	}
 	public static void deleteOwnVault(Player sender, String arg) {
@@ -84,16 +78,16 @@ public class VaultOperations {
 				number = Integer.parseInt(arg);
 			}
 			catch(NumberFormatException nfe) {
-				sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!");
+				sender.sendMessage(pv+ChatColor.RED + "You need to specify a number!");
 			}
 			try {
 				vm.deleteVault(sender, sender.getName(), number);
 			} catch (IOException e) {
-				sender.sendMessage(pv+"There was an error deleting that vault!");
+				sender.sendMessage(pv + "There was an error deleting that vault!");
 			}
 		}
 	}
-	public static void deleteOtherVault(Player sender, String user, String arg) {
+	public static void deleteOtherVault(CommandSender sender, String user, String arg) {
 		if(sender.hasPermission("playervaults.delete")) {
 			if(arg.matches("^[0-9]{1,2}$")) {
 				int number = 0;
@@ -101,22 +95,16 @@ public class VaultOperations {
 					number = Integer.parseInt(arg);
 				}
 				catch(NumberFormatException nfe) {
-					sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!");
+					sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!");
 				}
 				try {
 					vm.deleteVault(sender, user, number);
 				} catch (IOException e) {
-					sender.sendMessage(pv+"There was an error deleting that vault!");
+					sender.sendMessage(pv + "There was an error deleting that vault!");
 				}
 			}
 		}
 		else Feedback.noPerms(sender);
 	}
 
-	private static boolean allowedWorld(Player player) {
-		World world = player.getWorld();
-		if(plugin.disabledWorlds().contains(world))
-			return false;
-		return true;
-	}
 }

src/com/drtshock/playervaults/util/VaultManager.java

@@ -6,6 +6,7 @@ import java.io.IOException;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -20,7 +21,7 @@ public class VaultManager {
 	public VaultManager(Main instance) {
 		this.plugin = instance;
 	}
-	
+
 	String title;
 	private final String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "vaults";
 
@@ -32,11 +33,11 @@ public class VaultManager {
 	 * @throws IOException 
 	 */
 	public void saveVault(Inventory inv, String player, int number) throws IOException {
-			// 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 yaml = playerVaultFile(player);
+		YamlConfiguration yaml = playerVaultFile(player);
-			yaml.set("vault" + number + "", ser);
+		yaml.set("vault" + number + "", ser);
-			saveFile(player, yaml);
+		saveFile(player, yaml);
 	}
 
 	/**
@@ -58,7 +59,7 @@ public class VaultManager {
 		}
 	}
 
-	public void deleteVault(Player sender, String target, int number) throws IOException {
+	public void deleteVault(CommandSender sender, String target, int number) throws IOException {
 		String name = target.toLowerCase();
 		File file = new File(directory + name + ".yml");
 		FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
@@ -89,7 +90,7 @@ public class VaultManager {
 		YamlConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
 		return playerFile;
 	}
-	
+
 	public void saveFile(String name, YamlConfiguration yaml) throws IOException {
 		File file = new File(directory + File.separator + name.toLowerCase() + ".yml");
 		yaml.save(file);