Update commands
Add delete other command. Allow console to delete vaults. Fix spacing :)
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -28,10 +27,9 @@ public class VaultOperations {
|
||||
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 {
|
||||
@@ -49,10 +47,6 @@ public class VaultOperations {
|
||||
Feedback.noPerms(sender);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
Feedback.badWorld(sender);
|
||||
}
|
||||
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(arg.matches("^[0-9]{1,2}$")) {
|
||||
int number = 0;
|
||||
@@ -113,10 +107,4 @@ public class VaultOperations {
|
||||
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.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);
|
||||
|
||||
Reference in New Issue
Block a user