diff --git a/src/main/java/com/graywolf336/jail/JailIO.java b/src/main/java/com/graywolf336/jail/JailIO.java index 433fe38..f3d88ff 100644 --- a/src/main/java/com/graywolf336/jail/JailIO.java +++ b/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 + "'"; diff --git a/src/main/java/com/graywolf336/jail/command/CommandHandler.java b/src/main/java/com/graywolf336/jail/command/CommandHandler.java index 06ce02c..46ff95c 100644 --- a/src/main/java/com/graywolf336/jail/command/CommandHandler.java +++ b/src/main/java/com/graywolf336/jail/command/CommandHandler.java @@ -39,7 +39,7 @@ public class CommandHandler { public List parseTabComplete(JailManager jm, CommandSender sender, String commandLine, String[] args) throws Exception { List 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 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()); diff --git a/src/main/java/com/graywolf336/jail/command/JailHandler.java b/src/main/java/com/graywolf336/jail/command/JailHandler.java index bc25214..2be3e4d 100644 --- a/src/main/java/com/graywolf336/jail/command/JailHandler.java +++ b/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 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,12 +182,10 @@ 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(!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; - } + if(!i.permission().isEmpty() && !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 diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java index 81a970f..0f90eb9 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java +++ b/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()) { - reason = Lang.DEFAULTJAILEDREASON.get(); - }else { + if(params.isReason()) { 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,9 +321,8 @@ public class JailCommand implements Command { List results = new ArrayList(); for(Cell c : jm.getJail(jail).getCells()) - if(!c.hasPrisoner()) - if(cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell)) - results.add(c.getName()); + if(!c.hasPrisoner() && (cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell))) + results.add(c.getName()); Collections.sort(results); diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailListCellsCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailListCellsCommand.java index 3cb4cca..b1c7c79 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailListCellsCommand.java +++ b/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])); } diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailTransferCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailTransferCommand.java index d760560..15411ec 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailTransferCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailTransferCommand.java @@ -194,9 +194,8 @@ public class JailTransferCommand implements Command { List results = new ArrayList(); for(Cell c : jm.getJail(jail).getCells()) - if(!c.hasPrisoner()) - if(cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell)) - results.add(c.getName()); + if(!c.hasPrisoner() && (cell.isEmpty() || StringUtil.startsWithIgnoreCase(c.getName(), cell))) + results.add(c.getName()); Collections.sort(results); diff --git a/src/main/java/com/graywolf336/jail/listeners/HandCuffListener.java b/src/main/java/com/graywolf336/jail/listeners/HandCuffListener.java index fb5eee8..bf82629 100644 --- a/src/main/java/com/graywolf336/jail/listeners/HandCuffListener.java +++ b/src/main/java/com/graywolf336/jail/listeners/HandCuffListener.java @@ -47,19 +47,17 @@ public class HandCuffListener implements Listener { public void onPlayerTeleport(PlayerTeleportEvent event) { if(event.isCancelled()) return; - if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) { - 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()); + if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && 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()); - tos.put(event.getPlayer().getName(), to); - event.getPlayer().teleport(to); + tos.put(event.getPlayer().getName(), to); + event.getPlayer().teleport(to); - if(System.currentTimeMillis() >= pl.getHandCuffManager().getNextMessageTime(event.getPlayer().getUniqueId())) { - event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and cant move!"); - pl.getHandCuffManager().updateNextTime(event.getPlayer().getUniqueId()); - } + if(System.currentTimeMillis() >= pl.getHandCuffManager().getNextMessageTime(event.getPlayer().getUniqueId())) { + event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and cant move!"); + pl.getHandCuffManager().updateNextTime(event.getPlayer().getUniqueId()); } } } @@ -68,11 +66,9 @@ public class HandCuffListener implements Listener { public void playerChat(AsyncPlayerChatEvent event) { if(event.isCancelled()) return; - if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId())) { - if(!event.getPlayer().hasPermission("jail.command.handcuff")) { - event.setCancelled(true); - event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and aren't allowed to talk!"); - } + if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && !event.getPlayer().hasPermission("jail.command.handcuff")) { + event.setCancelled(true); + event.getPlayer().sendMessage(ChatColor.RED + "You are handcuffed and aren't allowed to talk!"); } } @@ -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(!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!"); - } - } + if (pl.getHandCuffManager().isHandCuffed(event.getPlayer().getUniqueId()) && !event.getPlayer().hasPermission("jail.command.handcuff") && (!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!"); } } } diff --git a/src/test/java/test/java/com/graywolf336/jail/util/MockPlayerInventory.java b/src/test/java/test/java/com/graywolf336/jail/util/MockPlayerInventory.java index e333026..f7e21e6 100644 --- a/src/test/java/test/java/com/graywolf336/jail/util/MockPlayerInventory.java +++ b/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]; - ItemStack[] inventoryContents = new ItemStack[inventorySize]; + private ItemStack[] armorContents = new ItemStack[armorSize]; + private ItemStack[] inventoryContents = new ItemStack[inventorySize]; @Override public ItemStack[] getArmorContents() { diff --git a/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java b/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java index 723f164..6769792 100644 --- a/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java +++ b/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java @@ -394,6 +394,10 @@ public class TestInstanceCreator { public CommandSender getPlayerCommandSender() { return this.mockPlayerSender; } + + public ConsoleCommandSender getConsoleSender() { + return this.consoleSender; + } private void deleteFolder(File folder) { File[] files = folder.listFiles();