More fixes to /tjail

Don't prevent unjailing an admin
Fix time change
This commit is contained in:
snowleo 2011-07-19 01:12:19 +02:00
parent 6b85b306ef
commit a65390ed98

View File

@ -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);