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 a5965300d..eb87959a3 100644 --- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java @@ -57,8 +57,9 @@ public class PtpCommand implements CommandExecutor { } int ptpCooldown = Config.getInstance().getPTPCommandCooldown(); + long recentlyHurt = playerProfile.getRecentlyHurt() * Misc.TIME_CONVERSION_FACTOR; - if (playerProfile.getRecentlyHurt() + (ptpCooldown * Misc.TIME_CONVERSION_FACTOR) > System.currentTimeMillis()) { + if (System.currentTimeMillis() - recentlyHurt >= (ptpCooldown * Misc.TIME_CONVERSION_FACTOR)) { player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", ptpCooldown)); return true; } diff --git a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java index 8ddd8d101..1a0c49dd0 100644 --- a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java +++ b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java @@ -30,7 +30,7 @@ public final class ChimaeraWing { PlayerProfile profile = UserManager.getPlayer(player).getProfile(); Block block = player.getLocation().getBlock(); int amount = inHand.getAmount(); - long recentlyHurt = profile.getRecentlyHurt(); + long recentlyHurt = profile.getRecentlyHurt() * Misc.TIME_CONVERSION_FACTOR; if (Permissions.chimaeraWing(player) && inHand.getTypeId() == Config.getInstance().getChimaeraItemId()) { if (SkillUtils.cooldownOver(recentlyHurt, 60, player) && amount >= Config.getInstance().getChimaeraCost()) {