nossr50 14 years ago
parent
commit
7090a772cb
2 changed files with 5 additions and 2 deletions
  1. 3 0
      mcMMO/Changelog.txt
  2. 2 2
      mcMMO/com/gmail/nossr50/mcItem.java

+ 3 - 0
mcMMO/Changelog.txt

@@ -1,5 +1,8 @@
 Changelog:
 #Versions without changelogs probably had very small misc fixes, like tweaks to the source code#
+Version 0.9.22
+Fixed bug where chimaera wing was unusable after being hurt even after the cooldown
+
 Version 0.9.21
 /mcrefresh fixed to work properly with the new ability monitoring system
 Ability lengths are now based on your skill level directly rather than a tiered system

+ 2 - 2
mcMMO/com/gmail/nossr50/mcItem.java

@@ -29,7 +29,7 @@ public class mcItem {
 		ItemStack is = player.getItemInHand();
 		Block block = player.getLocation().getBlock();
 		if(mcPermissions.getInstance().chimaeraWing(player) && is.getTypeId() == 288){
-    		if(mcUsers.getProfile(player).getRecentlyHurt() == 0 && is.getAmount() >= mcLoadProperties.feathersConsumedByChimaeraWing){
+    		if(mcSkills.getInstance().cooldownOver(player, mcUsers.getProfile(player).getRecentlyHurt(), 60) && is.getAmount() >= mcLoadProperties.feathersConsumedByChimaeraWing){
     			Block derp = player.getLocation().getBlock();
     			int y = derp.getY();
     			ItemStack[] inventory = player.getInventory().getContents();
@@ -65,7 +65,7 @@ public class mcItem {
     				player.teleportTo(player.getWorld().getSpawnLocation());
     			}
     			player.sendMessage("**CHIMAERA WING**");
-    		} else if (mcUsers.getProfile(player).getRecentlyHurt() >= 1 && is.getAmount() >= 10) {
+    		} else if (!mcSkills.getInstance().cooldownOver(player, mcUsers.getProfile(player).getRecentlyHurt(), 60) && is.getAmount() >= 10) {
     			player.sendMessage("You were injured recently and must wait to use this."
     					+ChatColor.YELLOW+" ("+mcSkills.getInstance().calculateTimeLeft(player, mcUsers.getProfile(player).getRecentlyHurt(), 60)+"s)");
     		} else if (is.getTypeId() == 288 && is.getAmount() <= 9){