--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/Jail.java 2012/10/15 08:02:16 1863 +++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/Jail.java 2015/03/09 14:36:19 2438 @@ -10,7 +10,6 @@ import org.bukkit.entity.Player; import org.bukkit.OfflinePlayer; import org.bukkit.plugin.Plugin; - import org.bukkit.event.Listener; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerTeleportEvent; @@ -18,15 +17,11 @@ import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerRespawnEvent; - import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; - import org.bukkit.configuration.file.YamlConfiguration; -import java.io.File; import java.io.*; - import java.util.ArrayList; import java.util.Set; import java.util.TreeSet; @@ -66,6 +61,7 @@ jailLocation = loadLocation(config, plugin.getServer(), "jailloc"); releaseLocation = loadLocation(config, plugin.getServer(), "releaseloc"); + @SuppressWarnings("unchecked") Set tmpSet = (Set) config.get("jails"); jailed.addAll(tmpSet); } @@ -120,8 +116,10 @@ if (sender instanceof Player ) { Player p = (Player) sender; - if ( !p.isOp()) { - p.sendMessage("Only server operators may use this command"); + if ( p.isOp() || p.hasPermission("hoeruputils.jail") ) { + //do nothing + } else { + p.sendMessage("Only server operators or players with hoeruputils.jail priv may use this command"); return true; } } else { @@ -153,7 +151,7 @@ } jailed.add( inmate.getName() ); save(); - sender.sendMessage("player is imprisoned"); + sender.sendMessage("player " + inmate.getName() + " is imprisoned"); return true; } @@ -178,7 +176,7 @@ plugin.getMessageWrapper().sendMessage("Jail System", inmate, "You have been release from jail - you are free to go home"); } save(); - sender.sendMessage("player is released"); + sender.sendMessage("player " + inmate.getName() + " is released"); return true; }