From 3440833af8bebbcd9e463dbb5174da41cd8d864f Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Tue, 5 Mar 2013 00:48:48 +0100 Subject: [PATCH] Fixed bug where the PTP cooldown was being read improperly --- Changelog.txt | 2 ++ .../java/com/gmail/nossr50/commands/party/PtpCommand.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 910a0441b..96a463937 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -11,6 +11,8 @@ Version 1.4.02-dev + Added API to get the skill and power level caps. = Fixed bug where Deflect was calculated based on the attacker, not the defender = Fixed bug where some skills weren't registering as unlocked until one level later + = Fixed bug where the PTP cooldown was being read improperly + = Fixed bug where /ptp where broken Version 1.4.01 = Fixed bug where trying to use /mctop or /xplock with the Smelting child skill caused NPEs diff --git a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java index 17ea23178..3c75473f0 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java @@ -54,9 +54,9 @@ public class PtpCommand implements CommandExecutor { } int ptpCooldown = Config.getInstance().getPTPCommandCooldown(); - long recentlyHurt = UserManager.getPlayer(player).getRecentlyHurt() * Misc.TIME_CONVERSION_FACTOR; + long recentlyHurt = UserManager.getPlayer(player).getRecentlyHurt(); - if (System.currentTimeMillis() - recentlyHurt >= (ptpCooldown * Misc.TIME_CONVERSION_FACTOR)) { + if ((recentlyHurt * Misc.TIME_CONVERSION_FACTOR + ptpCooldown * Misc.TIME_CONVERSION_FACTOR) > System.currentTimeMillis()) { player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", ptpCooldown)); return true; }