From a65390ed98986028feeb44a566a76086736e35cb Mon Sep 17 00:00:00 2001 From: snowleo Date: Tue, 19 Jul 2011 01:12:19 +0200 Subject: [PATCH] More fixes to /tjail Don't prevent unjailing an admin Fix time change --- .../essentials/commands/Commandtogglejail.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java index ccb1e6781..8e5480e74 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java @@ -23,14 +23,14 @@ public class Commandtogglejail extends EssentialsCommand } User p = getPlayer(server, args, 0, true); - if (p.isAuthorized("essentials.jail.exempt")) - { - sender.sendMessage(Util.i18n("mayNotJail")); - return; - } if (args.length >= 2 && !p.isJailed()) { + if (p.isAuthorized("essentials.jail.exempt")) + { + sender.sendMessage(Util.i18n("mayNotJail")); + return; + } charge(sender); p.setJailed(true); p.sendMessage(Util.i18n("userJailed")); @@ -64,7 +64,7 @@ public class Commandtogglejail extends EssentialsCommand return; } - if (args.length >= 2 && p.isJailed() && !args[1].equalsIgnoreCase(p.getJail())) + if (args.length >= 2 && p.isJailed() && args[1].equalsIgnoreCase(p.getJail())) { String time = getFinalArg(args, 2); long timeDiff = Util.parseDateDiff(time, true);