diff --git a/bin/com/drtshock/playervaults/commands/Commands.class b/bin/com/drtshock/playervaults/commands/Commands.class index 3a62515..cb76270 100644 Binary files a/bin/com/drtshock/playervaults/commands/Commands.class and b/bin/com/drtshock/playervaults/commands/Commands.class differ diff --git a/bin/com/drtshock/playervaults/commands/Feedback$Type.class b/bin/com/drtshock/playervaults/commands/Feedback$Type.class index 265ee14..d03af5f 100644 Binary files a/bin/com/drtshock/playervaults/commands/Feedback$Type.class and b/bin/com/drtshock/playervaults/commands/Feedback$Type.class differ diff --git a/bin/com/drtshock/playervaults/commands/Feedback.class b/bin/com/drtshock/playervaults/commands/Feedback.class index 43988c6..2fcf9b5 100644 Binary files a/bin/com/drtshock/playervaults/commands/Feedback.class and b/bin/com/drtshock/playervaults/commands/Feedback.class differ diff --git a/bin/com/drtshock/playervaults/commands/VaultOperations.class b/bin/com/drtshock/playervaults/commands/VaultOperations.class index a72b4c2..bf9f450 100644 Binary files a/bin/com/drtshock/playervaults/commands/VaultOperations.class and b/bin/com/drtshock/playervaults/commands/VaultOperations.class differ diff --git a/bin/com/drtshock/playervaults/util/VaultManager.class b/bin/com/drtshock/playervaults/util/VaultManager.class index a632389..418f872 100644 Binary files a/bin/com/drtshock/playervaults/util/VaultManager.class and b/bin/com/drtshock/playervaults/util/VaultManager.class differ diff --git a/src/com/drtshock/playervaults/commands/Commands.java b/src/com/drtshock/playervaults/commands/Commands.java index 437b047..e65eb19 100644 --- a/src/com/drtshock/playervaults/commands/Commands.java +++ b/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) { - Player p = (Player) sender; - switch(args.length) { - case 1: + switch(args.length) { + case 1: + if(sender instanceof Player) { + 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; } diff --git a/src/com/drtshock/playervaults/commands/Feedback.java b/src/com/drtshock/playervaults/commands/Feedback.java index 7bbe0fa..2f33a0e 100644 --- a/src/com/drtshock/playervaults/commands/Feedback.java +++ b/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 "); } } - - public static void badWorld(Player sender) { - sender.sendMessage(pv + "You can't use this in that world!"); - return; - } } diff --git a/src/com/drtshock/playervaults/commands/VaultOperations.java b/src/com/drtshock/playervaults/commands/VaultOperations.java index 0e1f2bb..9e7bae7 100644 --- a/src/com/drtshock/playervaults/commands/VaultOperations.java +++ b/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}$")) { - int number = 0; - try { - number = Integer.parseInt(arg); - } - catch(NumberFormatException nfe) { - sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!"); - return false; - } - if(checkPerms(sender, number)) { - vm.loadVault(sender, sender.getName(), number); - sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); - return true; - } else { - Feedback.noPerms(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!"); + return false; + } + if(checkPerms(sender, number)) { + vm.loadVault(sender, sender.getName(), number); + sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); + return true; + } else { + 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; - } } diff --git a/src/com/drtshock/playervaults/util/VaultManager.java b/src/com/drtshock/playervaults/util/VaultManager.java index b2731b5..1120c8e 100644 --- a/src/com/drtshock/playervaults/util/VaultManager.java +++ b/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. - String ser = Serialization.toBase64(inv); - YamlConfiguration yaml = playerVaultFile(player); - yaml.set("vault" + number + "", ser); - saveFile(player, yaml); + // Get the player's file and serialize the inventory. + String ser = Serialization.toBase64(inv); + YamlConfiguration yaml = playerVaultFile(player); + yaml.set("vault" + number + "", ser); + 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);