Update commands

Add delete other command.
Allow console to delete vaults.
Fix spacing :)
This commit is contained in:
Trent Hensler
2013-03-07 13:29:10 -06:00
parent 46730b1511
commit 6f73e45496
9 changed files with 51 additions and 64 deletions
@@ -36,19 +36,23 @@ public class Commands implements CommandExecutor {
} }
else sender.sendMessage(pv + "Sorry but that can only be run by a player!"); else sender.sendMessage(pv + "Sorry but that can only be run by a player!");
} }
else if(cmd.getName().equalsIgnoreCase("pvdel")) { else if(cmd.getName().equalsIgnoreCase("pvdel")) {
if(sender instanceof Player) {
Player p = (Player) sender;
switch(args.length) { switch(args.length) {
case 1: case 1:
if(sender instanceof Player) {
Player p = (Player) sender;
VaultOperations.deleteOwnVault(p, args[0]); 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; break;
default: default:
Feedback.showHelp(sender, Feedback.Type.DELETE); Feedback.showHelp(sender, Feedback.Type.DELETE);
} }
} }
else sender.sendMessage(pv + "Sorry but that can only be run by a player!");
}
return true; return true;
} }
} }
@@ -2,7 +2,6 @@ package com.drtshock.playervaults.commands;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class Feedback { public class Feedback {
@@ -31,9 +30,4 @@ public class Feedback {
sender.sendMessage(pv + "/pvdel <player> <number>"); sender.sendMessage(pv + "/pvdel <player> <number>");
} }
} }
public static void badWorld(Player sender) {
sender.sendMessage(pv + "You can't use this in that world!");
return;
}
} }
@@ -4,7 +4,6 @@ import java.io.IOException;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -28,10 +27,9 @@ public class VaultOperations {
return false; return false;
} }
/* /*
* TODO: Chenge how permissions are checked here. * TODO: Change how permissions are checked here.
*/ */
public static boolean openOwnVault(Player sender, String arg) { 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 {
@@ -49,10 +47,6 @@ public class VaultOperations {
Feedback.noPerms(sender); Feedback.noPerms(sender);
} }
} }
}
else {
Feedback.badWorld(sender);
}
return false; return false;
} }
@@ -93,7 +87,7 @@ public class VaultOperations {
} }
} }
} }
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(sender.hasPermission("playervaults.delete")) {
if(arg.matches("^[0-9]{1,2}$")) { if(arg.matches("^[0-9]{1,2}$")) {
int number = 0; int number = 0;
@@ -113,10 +107,4 @@ public class VaultOperations {
else Feedback.noPerms(sender); else Feedback.noPerms(sender);
} }
private static boolean allowedWorld(Player player) {
World world = player.getWorld();
if(plugin.disabledWorlds().contains(world))
return false;
return true;
}
} }
@@ -6,6 +6,7 @@ import java.io.IOException;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; 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(); String name = target.toLowerCase();
File file = new File(directory + name + ".yml"); File file = new File(directory + name + ".yml");
FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file); FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file);