--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/Jail.java 2012/10/15 07:01:57 1859 +++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/Jail.java 2012/10/15 07:39:17 1861 @@ -112,31 +112,36 @@ @Override public boolean onCommand(final CommandSender sender, Command command, String label, String[] args) { - if (! (sender instanceof Player) ) { - sender.sendMessage("only use these commands in-game"); + if (args.length == 0) { + sender.sendMessage("Usage: /jail "); return true; } - - Player p = (Player) sender; - - if ( !p.isOp()) { - p.sendMessage("Only server operators may use this command"); - return true; + + if (sender instanceof Player ) { + Player p = (Player) sender; + if ( !p.isOp()) { + p.sendMessage("Only server operators may use this command"); + return true; + } + } else { + if ( args[0].equals("imprison") || args[0].equals("release") || args[0].equals("list") ) { + //do nothing + } else { + sender.sendMessage("only imprison, release and list may be used from console"); + return true; + } } - if (args.length == 0) { - p.sendMessage("Usage: /jail "); - return true; - } if (args[0].equals("imprison")) { if (args.length != 2) { + sender.sendMessage("You must specify the player"); return true; } Player inmate = sender.getServer().getPlayer( args[1] ); if (inmate == null) { - p.sendMessage("Player not found"); + sender.sendMessage("Player not found"); return true; } @@ -150,12 +155,13 @@ if (args[0].equals("release")) { if (args.length != 2) { + sender.sendMessage("You must specify the player"); return true; } Player inmate = sender.getServer().getPlayer( args[1] ); if (inmate == null) { - p.sendMessage("Player not found"); + sender.sendMessage("Player not found"); return true; } @@ -182,12 +188,14 @@ } if (args[0].equals("setjail")) { + Player p = (Player) sender; jailLocation = p.getLocation().clone(); p.sendMessage("New jail location has been set"); save(); return true; } if (args[0].equals("setrelease")) { + Player p = (Player) sender; releaseLocation = p.getLocation().clone(); p.sendMessage("New release location has been set"); save(); @@ -195,10 +203,12 @@ } if (args[0].equals("tpjail")) { + Player p = (Player) sender; p.teleport(jailLocation); return true; } if (args[0].equals("tprelease")) { + Player p = (Player) sender; p.teleport(releaseLocation); return true; }