Browse Source

Fix another potential issue with recentlyHurt & /ptp.

GJ 12 years ago
parent
commit
12c6bfc2e8

+ 2 - 1
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;
                 }

+ 1 - 1
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()) {