minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 18:14:38 +02:00
Code Issues Releases Wiki Activity

[trunk] Last heal, Last teleport: Don't error if it's the first time.

Browse Source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1144 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo
2011-04-07 16:57:06 +00:00
parent 3908443717
commit 5dcb5e02fb
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Essentials/src/com/earth2me/essentials/User.java
View File

@@ -139,10 +139,13 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
public void teleportCooldown(boolean justCheck) throws Exception public void teleportCooldown(boolean justCheck) throws Exception
{ {
long now = Calendar.getInstance().getTimeInMillis(); long now = Calendar.getInstance().getTimeInMillis();
if (lastTeleport > 0) {
long cooldown = Essentials.getSettings().getTeleportCooldown(); long cooldown = Essentials.getSettings().getTeleportCooldown();
long left = lastTeleport + cooldown - now; long left = lastTeleport + cooldown - now;
if (left > 0 && !isOp() && !isAuthorized("essentials.teleport.cooldown.bypass")) if (left > 0 && !isOp() && !isAuthorized("essentials.teleport.cooldown.bypass")) {
throw new Exception("Time before next teleport: " + Essentials.FormatTime(left)); throw new Exception("Time before next teleport: " + Essentials.FormatTime(left));
}
}
// if justCheck is set, don't update lastTeleport; we're just checking // if justCheck is set, don't update lastTeleport; we're just checking
if (!justCheck) lastTeleport = now; if (!justCheck) lastTeleport = now;
} }
@@ -155,10 +158,13 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
public void healCooldown() throws Exception public void healCooldown() throws Exception
{ {
long now = Calendar.getInstance().getTimeInMillis(); long now = Calendar.getInstance().getTimeInMillis();
if (lastHeal > 0) {
long cooldown = Essentials.getSettings().getHealCooldown(); long cooldown = Essentials.getSettings().getHealCooldown();
long left = lastHeal + cooldown - now; long left = lastHeal + cooldown - now;
if (left > 0 && !isOp() && !isAuthorized("essentials.heal.cooldown.bypass")) if (left > 0 && !isOp() && !isAuthorized("essentials.heal.cooldown.bypass")) {
throw new Exception("Time before next heal: " + Essentials.FormatTime(left)); throw new Exception("Time before next heal: " + Essentials.FormatTime(left));
}
}
lastHeal = now; lastHeal = now;
} }