diff --git a/src/me/shock/playervaults/commands/Commands.java b/src/me/shock/playervaults/commands/Commands.java index 08eefbe..c585c71 100644 --- a/src/me/shock/playervaults/commands/Commands.java +++ b/src/me/shock/playervaults/commands/Commands.java @@ -11,7 +11,6 @@ import org.bukkit.entity.Player; public class Commands implements CommandExecutor { public static ConcurrentHashMap inVault = new ConcurrentHashMap(); - private String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; @@ -23,8 +22,9 @@ public class Commands implements CommandExecutor { if(OwnVault.openOwnVault(sender, args[0])) inVault.put(sender.getName(), Integer.parseInt(args[0])); } + } else { + Feedback.showHelp(sender); } - } return true; } @@ -36,4 +36,4 @@ public class Commands implements CommandExecutor { } return true; } -} \ No newline at end of file +} diff --git a/src/me/shock/playervaults/commands/Feedback.java b/src/me/shock/playervaults/commands/Feedback.java index 6a1b2b9..269bb27 100644 --- a/src/me/shock/playervaults/commands/Feedback.java +++ b/src/me/shock/playervaults/commands/Feedback.java @@ -1,11 +1,16 @@ package me.shock.playervaults.commands; +import me.shock.playervaults.Main; + import org.bukkit.ChatColor; +import org.bukkit.World; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; 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 + ": "; 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 "); sender.sendMessage(pv + "/vault delete "); } + + 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; + } } diff --git a/src/me/shock/playervaults/commands/OwnVault.java b/src/me/shock/playervaults/commands/OwnVault.java index 104eda4..6dc76e0 100644 --- a/src/me/shock/playervaults/commands/OwnVault.java +++ b/src/me/shock/playervaults/commands/OwnVault.java @@ -5,6 +5,7 @@ import me.shock.playervaults.util.VaultManager; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class OwnVault { @@ -19,10 +20,13 @@ public class OwnVault { if(arg0.matches("^[0-9]{1,2}$")) { System.out.println("yay regex!"); if(sender.hasPermission("playervaults.amount." + arg0)) { - int number = Integer.parseInt(arg0); - vm.loadVault(sender, sender.getName(), number); - sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); - return true; + if(Feedback.allowedWorld((Player) sender)) { + int number = Integer.parseInt(arg0); + vm.loadVault(sender, sender.getName(), number); + sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); + return true; + } else + return false; } else { feedback.noPerms(sender); } diff --git a/src/me/shock/playervaults/util/VaultManager.java b/src/me/shock/playervaults/util/VaultManager.java index 3bf74e6..8da559d 100644 --- a/src/me/shock/playervaults/util/VaultManager.java +++ b/src/me/shock/playervaults/util/VaultManager.java @@ -38,7 +38,7 @@ public class VaultManager { // Get the player's file and serialize the inventory. String ser = Serialization.toBase64(inv); YamlConfiguration file = playerVaultFile(player.getName()); - System.out.println("" + inv); + System.out.println("serial: " + ser); // Prepare to save D: file.set("vault" + number + "", ser); }