Check for world.

This commit is contained in:
Trent Hensler
2013-02-13 01:39:50 -06:00
parent df8713c724
commit 06360fd7ba
4 changed files with 33 additions and 11 deletions
@@ -11,7 +11,6 @@ import org.bukkit.entity.Player;
public class Commands implements CommandExecutor { public class Commands implements CommandExecutor {
public static ConcurrentHashMap<String, Integer> inVault = new ConcurrentHashMap<String, Integer>(); public static ConcurrentHashMap<String, Integer> inVault = new ConcurrentHashMap<String, Integer>();
private String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + private String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" +
ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
@@ -23,8 +22,9 @@ public class Commands implements CommandExecutor {
if(OwnVault.openOwnVault(sender, args[0])) if(OwnVault.openOwnVault(sender, args[0]))
inVault.put(sender.getName(), Integer.parseInt(args[0])); inVault.put(sender.getName(), Integer.parseInt(args[0]));
} }
} else {
Feedback.showHelp(sender);
} }
} }
return true; return true;
} }
@@ -1,11 +1,16 @@
package me.shock.playervaults.commands; package me.shock.playervaults.commands;
import me.shock.playervaults.Main;
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;
public class Feedback { public class Feedback {
String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + private static Main main;
static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" +
ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
public void noPerms(CommandSender sender) { public void noPerms(CommandSender sender) {
@@ -14,8 +19,21 @@ public class Feedback {
} }
public void showHelp(CommandSender sender) { public static void showHelp(CommandSender sender) {
sender.sendMessage(pv + "/vault <number>"); sender.sendMessage(pv + "/vault <number>");
sender.sendMessage(pv + "/vault delete <number>"); sender.sendMessage(pv + "/vault delete <number>");
} }
public static void badWorld(CommandSender sender) {
sender.sendMessage(pv + "You can't use this in that world!");
return;
}
public static boolean allowedWorld(Player player) {
World world = player.getWorld();
if(main.disabledWorlds().contains(world))
return false;
return true;
}
} }
@@ -5,6 +5,7 @@ import me.shock.playervaults.util.VaultManager;
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 OwnVault { public class OwnVault {
@@ -19,10 +20,13 @@ public class OwnVault {
if(arg0.matches("^[0-9]{1,2}$")) { if(arg0.matches("^[0-9]{1,2}$")) {
System.out.println("yay regex!"); System.out.println("yay regex!");
if(sender.hasPermission("playervaults.amount." + arg0)) { if(sender.hasPermission("playervaults.amount." + arg0)) {
int number = Integer.parseInt(arg0); if(Feedback.allowedWorld((Player) sender)) {
vm.loadVault(sender, sender.getName(), number); int number = Integer.parseInt(arg0);
sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); vm.loadVault(sender, sender.getName(), number);
return true; sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number);
return true;
} else
return false;
} else { } else {
feedback.noPerms(sender); feedback.noPerms(sender);
} }
@@ -38,7 +38,7 @@ public class VaultManager {
// 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 file = playerVaultFile(player.getName()); YamlConfiguration file = playerVaultFile(player.getName());
System.out.println("" + inv); System.out.println("serial: " + ser);
// Prepare to save D: // Prepare to save D:
file.set("vault" + number + "", ser); file.set("vault" + number + "", ser);
} }