summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-08-19 12:16:28 +0100
committerKHobbits <rob@khobbits.co.uk>2011-08-19 12:16:28 +0100
commitcbfb6e42dbb92a8520ea383b27785257327b4974 (patch)
tree5c38e2fb3e87414e48f85531faddf9947dffe1a1
parent3d7770f462c9798f0b5deff6486fa50a708b0e4f (diff)
downloadEssentials-cbfb6e42dbb92a8520ea383b27785257327b4974.tar
Essentials-cbfb6e42dbb92a8520ea383b27785257327b4974.tar.gz
Essentials-cbfb6e42dbb92a8520ea383b27785257327b4974.tar.lz
Essentials-cbfb6e42dbb92a8520ea383b27785257327b4974.tar.xz
Essentials-cbfb6e42dbb92a8520ea383b27785257327b4974.zip
Check jail first, before setting.
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
index 5fafe3374..c88cdc5a6 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
@@ -45,9 +45,6 @@ public class Commandtogglejail extends EssentialsCommand
}
}
charge(sender);
- p.setJailed(true);
- p.sendMessage(Util.i18n("userJailed"));
- p.setJail(null);
if (!(p.getBase() instanceof OfflinePlayer))
{
ess.getJail().sendToJail(p, args[1]);
@@ -57,6 +54,9 @@ public class Commandtogglejail extends EssentialsCommand
// Check if jail exists
ess.getJail().getJail(args[1]);
}
+ p.setJailed(true);
+ p.sendMessage(Util.i18n("userJailed"));
+ p.setJail(null);
p.setJail(args[1]);
long timeDiff = 0;
if (args.length > 2)