From 903ccfc7988abd4aa2cc87844a88a912cd44f6c0 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 30 Mar 2011 13:28:57 +0000 Subject: [PATCH] Commit 1001 git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1027 e251c2fe-e539-e718-e476-b85c1f46cddb --- Essentials/src/com/earth2me/essentials/User.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 0853975ca..c3fe0ce5f 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -139,7 +139,7 @@ public class User extends PlayerExtension implements Comparable long now = Calendar.getInstance().getTimeInMillis(); long cooldown = Essentials.getSettings().getTeleportCooldown(); long left = lastTeleport + cooldown - now; - if (left > 0 && !isOp() && !isAuthorized("essentials.teleport.cooldown.bypass")) + if ((left > 0 && !isOp() && !isAuthorized("essentials.teleport.cooldown.bypass")) | !isJailed()) throw new Exception("Time before next teleport: " + Essentials.FormatTime(left)); // if justCheck is set, don't update lastTeleport; we're just checking if (!justCheck) lastTeleport = now; @@ -385,6 +385,7 @@ public class User extends PlayerExtension implements Comparable public void teleportTo(final Location loc, final String chargeFor) { + final long delay = Essentials.getSettings().getTeleportDelay(); if (delay <= 0 || isOp() || isAuthorized("essentials.teleport.timer.bypass")) @@ -434,6 +435,7 @@ public class User extends PlayerExtension implements Comparable public void teleportTo(final Entity entity, final String chargeFor) { + final long delay = Essentials.getSettings().getTeleportDelay(); if (delay <= 0 || isOp() || isAuthorized("essentials.teleport.timer.bypass"))