diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-03-30 13:28:57 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-03-30 13:28:57 +0000 |
| commit | f42c5ee31261e782115a1c24e21a641ad9bf78c9 (patch) | |
| tree | 3e0f8003dd8f2e15a3cc443c3c6049b5625013f3 | |
| parent | d869f01d084f63c5931639a88baaa918ac6aa9ef (diff) | |
| download | Essentials-f42c5ee31261e782115a1c24e21a641ad9bf78c9.tar Essentials-f42c5ee31261e782115a1c24e21a641ad9bf78c9.tar.gz Essentials-f42c5ee31261e782115a1c24e21a641ad9bf78c9.tar.lz Essentials-f42c5ee31261e782115a1c24e21a641ad9bf78c9.tar.xz Essentials-f42c5ee31261e782115a1c24e21a641ad9bf78c9.zip | |
Commit 1001
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1027 e251c2fe-e539-e718-e476-b85c1f46cddb
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/User.java | 4 |
1 files changed, 3 insertions, 1 deletions
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<User> 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<User> 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<User> public void teleportTo(final Entity entity, final String chargeFor) { + final long delay = Essentials.getSettings().getTeleportDelay(); if (delay <= 0 || isOp() || isAuthorized("essentials.teleport.timer.bypass")) |