Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-26 19:18:29 +01:00
Code Issues Projects Releases Wiki Activity

More fixes to /tjail

Browse Source 
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
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
View File

@ -23,14 +23,14 @@ public class Commandtogglejail extends EssentialsCommand
} }
User p = getPlayer(server, args, 0, true); User p = getPlayer(server, args, 0, true);
if (args.length >= 2 && !p.isJailed())
{
if (p.isAuthorized("essentials.jail.exempt")) if (p.isAuthorized("essentials.jail.exempt"))
{ {
sender.sendMessage(Util.i18n("mayNotJail")); sender.sendMessage(Util.i18n("mayNotJail"));
return; return;
} }
if (args.length >= 2 && !p.isJailed())
{
charge(sender); charge(sender);
p.setJailed(true); p.setJailed(true);
p.sendMessage(Util.i18n("userJailed")); p.sendMessage(Util.i18n("userJailed"));
@ -64,7 +64,7 @@ public class Commandtogglejail extends EssentialsCommand
return; 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); String time = getFinalArg(args, 2);
long timeDiff = Util.parseDateDiff(time, true); long timeDiff = Util.parseDateDiff(time, true);