Update commands

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

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

@@ -36,19 +36,23 @@ 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) {
-				Player p = (Player) sender;
 			switch(args.length) {
 			case 1:
+				if(sender instanceof Player) {
+					Player p = (Player) sender;
 					VaultOperations.deleteOwnVault(p, args[0]);
+				}
+				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 {
@@ -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;
 
@@ -21,24 +20,23 @@ public class VaultOperations {
 
 
 	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}$")) {
 			int number = 0;
 			try {
 				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!");
 				return false;
 			}
 			if(checkPerms(sender, number)) {
@@ -49,10 +47,6 @@ public class VaultOperations {
 				Feedback.noPerms(sender);
 			}
 		}
-		}
-		else {
-			Feedback.badWorld(sender);
-		}
 		return false;
 	}
 
@@ -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);
@@ -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;
@@ -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);