Fix some code style issues

src/main/java/com/graywolf336/jail/JailIO.java

@@ -407,6 +407,9 @@ public class JailIO {
                 default:
                     break;
             }
+            
+            //Make sure the statement is closed.
+            if(!st.isClosed()) st.close();
         } catch (SQLException e) {
             e.printStackTrace();
             pl.getLogger().severe("---------- Jail Error!!! ----------");
@@ -512,7 +515,7 @@ public class JailIO {
                 }
 
                 //Remove the invalid prisoners
-                if(cellsToRemove.size() != 0) {
+                if(!cellsToRemove.isEmpty()) {
                     StringBuilder ids = new StringBuilder();
                     for(int c : cellsToRemove) {
                         if(ids.length() == 0) ids.append("'" + c + "'");
@@ -585,7 +588,7 @@ public class JailIO {
                 }
 
                 //Remove the invalid prisoners
-                if(prisonersToRemove.size() != 0) {
+                if(!prisonersToRemove.isEmpty()) {
                     String names = "";
                     for(String s : prisonersToRemove) {
                         if(names.isEmpty()) names = "'" + s + "'";

src/main/java/com/graywolf336/jail/command/CommandHandler.java

@@ -39,7 +39,7 @@ public class CommandHandler {
     public List<String> parseTabComplete(JailManager jm, CommandSender sender, String commandLine, String[] args) throws Exception {
         List<Command> matches = getMatches(commandLine);
         
-        if(matches.size() == 0 || matches.size() > 1) return Collections.emptyList();
+        if(matches.isEmpty() || matches.size() > 1) return Collections.emptyList();
         else {
             CommandInfo i = matches.get(0).getClass().getAnnotation(CommandInfo.class);
             
@@ -83,7 +83,7 @@ public class CommandHandler {
         List<Command> matches = getMatches(commandLine);
 
         //If no matches were found, send them the unknown command message.
-        if(matches.size() == 0) {
+        if(matches.isEmpty()) {
             if(commandLine.startsWith("jail")) {
                 String j = commandLine.substring(0, 4);
                 String a0 = commandLine.substring(4, commandLine.length());

src/main/java/com/graywolf336/jail/command/JailHandler.java

@@ -162,7 +162,7 @@ public class JailHandler {
             //Get the matches from the first argument passed
             List<Command> matches = getMatches(args[0].toLowerCase());
 
-            if(matches.size() == 0) {
+            if(matches.isEmpty()) {
                 //No matches found, thus it is more likely than not they are trying to jail someone
                 c = getMatches("jail").get(0);
 
@@ -182,13 +182,11 @@ public class JailHandler {
         CommandInfo i = c.getClass().getAnnotation(CommandInfo.class);
 
         // First, let's check if the sender has permission for the command.
-        if(!i.permission().isEmpty()) {
+        if(!i.permission().isEmpty() && !sender.hasPermission(i.permission())) {
-            if(!sender.hasPermission(i.permission())) {
         	jailmanager.getPlugin().debug("Sender has no permission: " + i.permission());
             sender.sendMessage(Lang.NOPERMISSION.get() + (jailmanager.getPlugin().inDebug() ? " (" + i.permission() + ")" : ""));
             return true;
         }
-        }
 
         // Next, let's check if we need a player and then if the sender is actually a player
         if(i.needsPlayer() && !(sender instanceof Player)) {

src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java

@@ -202,9 +202,7 @@ public class JailCommand implements Command {
 
         //If the jailer gave no reason, then let's get the default reason
         String reason = "";
-        if(!params.isReason()) {
+        if(params.isReason()) {
-            reason = Lang.DEFAULTJAILEDREASON.get();
-        }else {
             StringBuilder sb = new StringBuilder();
             for(String s : params.getReason()) {
                 sb.append(s).append(' ');
@@ -212,6 +210,9 @@ public class JailCommand implements Command {
 
             sb.deleteCharAt(sb.length() - 1);
             reason = sb.toString();
+            
+        }else {
+        	reason = Lang.DEFAULTJAILEDREASON.get();
         }
 
         //If the config has automatic muting, then let's set them as muted
@@ -320,8 +321,7 @@ public class JailCommand implements Command {
         List<String> results = new ArrayList<String>();
         
         for(Cell c : jm.getJail(jail).getCells())
-            if(!c.hasPrisoner())
+            if(!c.hasPrisoner() && (cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell)))
-                if(cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell))
             	results.add(c.getName());
         
         Collections.sort(results);

src/main/java/com/graywolf336/jail/command/subcommands/JailListCellsCommand.java

@@ -39,7 +39,7 @@ public class JailListCellsCommand implements Command {
                 
                 Collections.sort(cells);
                 
-                sender.sendMessage(cells.size() == 0 ? Lang.NOCELLS.get(j.getName()) : ChatColor.GREEN + Util.getStringFromList(", ", cells));
+                sender.sendMessage(cells.isEmpty() ? Lang.NOCELLS.get(j.getName()) : ChatColor.GREEN + Util.getStringFromList(", ", cells));
             }else {
                 sender.sendMessage(Lang.NOJAIL.get(args[1]));
             }

src/main/java/com/graywolf336/jail/command/subcommands/JailTransferCommand.java

@@ -194,8 +194,7 @@ public class JailTransferCommand implements Command {
         List<String> results = new ArrayList<String>();
         
         for(Cell c : jm.getJail(jail).getCells())
-            if(!c.hasPrisoner())
+            if(!c.hasPrisoner() && (cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell)))
-                if(cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell))
             	results.add(c.getName());
         
         Collections.sort(results);

src/main/java/com/graywolf336/jail/listeners/HandCuffListener.java

@@ -47,8 +47,7 @@ public class HandCuffListener implements Listener {
     public void onPlayerTeleport(PlayerTeleportEvent event) {
         if(event.isCancelled()) return;
 
-        if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) {
+        if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && event.getTo() != tos.get(event.getPlayer().getName())) {
-            if(event.getTo() != tos.get(event.getPlayer().getName())) {
             Location to = pl.getHandCuffManager().getLocation(event.getPlayer().getUniqueId());
             to.setPitch(event.getTo().getPitch());
             to.setYaw(event.getTo().getYaw());
@@ -62,19 +61,16 @@ public class HandCuffListener implements Listener {
             }
         }
     }
-    }
 
     @EventHandler(ignoreCancelled=true)
     public void playerChat(AsyncPlayerChatEvent event) {
         if(event.isCancelled()) return;
 
-        if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) {
+        if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && !event.getPlayer().hasPermission("jail.command.handcuff")) {
-            if(!event.getPlayer().hasPermission("jail.command.handcuff")) {
         	event.setCancelled(true);
             event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and aren't allowed to talk!");
         }
     }
-    }
 
     @EventHandler(ignoreCancelled=true)
     public void blockBreak(BlockBreakEvent event) {
@@ -100,13 +96,9 @@ public class HandCuffListener implements Listener {
     public void preCommands(PlayerCommandPreprocessEvent event) {
         if(event.isCancelled()) return;
 
-        if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) {
+        if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && !event.getPlayer().hasPermission("jail.command.handcuff") && (!event.getMessage().startsWith("/r") || !event.getMessage().startsWith("/reply"))) {
-            if(!event.getPlayer().hasPermission("jail.command.handcuff")) {
-                if(!event.getMessage().startsWith("/r") || !event.getMessage().startsWith("/reply")) {
         	event.setCancelled(true);
             event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and aren't allowed to use commands!");
         }
     }
-        }
-    }
 }

src/test/java/test/java/com/graywolf336/jail/util/MockPlayerInventory.java

@@ -15,8 +15,8 @@ import org.bukkit.inventory.PlayerInventory;
 
 public class MockPlayerInventory implements PlayerInventory {
     private int armorSize = 4, inventorySize = 36;
-    ItemStack[] armorContents = new ItemStack[armorSize];
+    private ItemStack[] armorContents = new ItemStack[armorSize];
-    ItemStack[] inventoryContents = new ItemStack[inventorySize];
+    private ItemStack[] inventoryContents = new ItemStack[inventorySize];
 
     @Override
     public ItemStack[] getArmorContents() {

src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java

@@ -395,6 +395,10 @@ public class TestInstanceCreator {
         return this.mockPlayerSender;
     }
     
+    public ConsoleCommandSender getConsoleSender() {
+    	return this.consoleSender;
+    }
+
     private void deleteFolder(File folder) {
         File[] files = folder.listFiles();
         if(files != null) {