diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-05 16:53:26 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-05 16:53:26 +0000 |
| commit | 3ef2efd1fb0140a7f1cc87027cc25ca7b0c2a846 (patch) | |
| tree | 23a1f8ca29b7e8b353cea2d07f35696288c7a16f | |
| parent | 333ef69e8811dd97a07923a61e57a353630f8600 (diff) | |
| download | Essentials-3ef2efd1fb0140a7f1cc87027cc25ca7b0c2a846.tar Essentials-3ef2efd1fb0140a7f1cc87027cc25ca7b0c2a846.tar.gz Essentials-3ef2efd1fb0140a7f1cc87027cc25ca7b0c2a846.tar.lz Essentials-3ef2efd1fb0140a7f1cc87027cc25ca7b0c2a846.tar.xz Essentials-3ef2efd1fb0140a7f1cc87027cc25ca7b0c2a846.zip | |
[trunk] Teleport Cooldown: uncommented code
What was the regression here?
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1132 e251c2fe-e539-e718-e476-b85c1f46cddb
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/User.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 52b9298b3..272bc8cc4 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -138,16 +138,13 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo public void teleportCooldown(boolean justCheck) throws Exception { - return; // TODO: Fix this regression - /* long now = Calendar.getInstance().getTimeInMillis(); long cooldown = Essentials.getSettings().getTeleportCooldown(); long left = lastTeleport + cooldown - now; - if ((left > 0 && !isOp() && !isAuthorized("essentials.teleport.cooldown.bypass")) | !isJailed()) + if (left > 0 && !isOp() && !isAuthorized("essentials.teleport.cooldown.bypass")) 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; - */ } public void teleportCooldown() throws Exception |