summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-06-13 03:06:42 +0100
committerKHobbits <rob@khobbits.co.uk>2012-06-13 03:06:42 +0100
commit9b87450df13583221c8fbdd1063836c3ea662861 (patch)
treed2401e3ee621fda3acbf88b2340ac78fa870ad4d
parent2db6120402a4e50f3c2ce3b28d56a0dc65069823 (diff)
downloadEssentials-9b87450df13583221c8fbdd1063836c3ea662861.tar
Essentials-9b87450df13583221c8fbdd1063836c3ea662861.tar.gz
Essentials-9b87450df13583221c8fbdd1063836c3ea662861.tar.lz
Essentials-9b87450df13583221c8fbdd1063836c3ea662861.tar.xz
Essentials-9b87450df13583221c8fbdd1063836c3ea662861.zip
Revert "Invert teleport timer."
This reverts commit 2db6120402a4e50f3c2ce3b28d56a0dc65069823.
-rw-r--r--Essentials/src/com/earth2me/essentials/Teleport.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java
index 198ffab15..a920544cb 100644
--- a/Essentials/src/com/earth2me/essentials/Teleport.java
+++ b/Essentials/src/com/earth2me/essentials/Teleport.java
@@ -169,8 +169,8 @@ public class Teleport implements Runnable, ITeleport
else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
{
time.setTimeInMillis(lastTime);
- time.add(Calendar.SECOND, (-1) * (int)delay);
- time.add(Calendar.MILLISECOND, (-1) * (int)((delay * 1000.0) % 1000.0));
+ time.add(Calendar.SECOND, (int)delay);
+ time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis())));
}
}