From 3ef2efd1fb0140a7f1cc87027cc25ca7b0c2a846 Mon Sep 17 00:00:00 2001 From: snowleo Date: Tue, 5 Apr 2011 16:53:26 +0000 Subject: [PATCH] [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 --- Essentials/src/com/earth2me/essentials/User.java | 5 +---- 1 file changed, 1 insertion(+), 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, 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