From 630c3e81e617cb60b51a35b7f4864735bdb5a1eb Mon Sep 17 00:00:00 2001 From: GJ Date: Thu, 4 Apr 2013 09:59:10 -0400 Subject: [PATCH] Fixed Chimera Wing displaying warmup message if warmup was set to 0 --- Changelog.txt | 1 + .../runnables/items/ChimaeraWingWarmup.java | 2 +- .../java/com/gmail/nossr50/util/ChimaeraWing.java | 14 ++++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 5d2311fdd..e2b659b75 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -22,6 +22,7 @@ Version 1.4.05-dev = Fixed huge mushroom blocks not being properly tracked = Fixed potion buff option not using the appropriate # of ticks = Fixed Chimera Wing spamming console if Metrics was disabled + = Fixed Chimera Wing displaying warmup message if warmup was set to 0 Version 1.4.04 + Added functions to ExperienceAPI for use with offline players diff --git a/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java b/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java index c8819f3cc..31aa722f0 100644 --- a/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java +++ b/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java @@ -41,7 +41,7 @@ public class ChimaeraWingWarmup extends BukkitRunnable { } if (!ItemUtils.isChimaeraWing(inHand) || inHand.getAmount() < Config.getInstance().getChimaeraUseCost()) { - player.sendMessage(ChatColor.DARK_RED + "Not holding enough " + ChatColor.GRAY + "ChimaeraWings"); //TODO Locale! + player.sendMessage(LocaleLoader.getString("Skills.NeedMore", "Chimaera Wings")); //TODO Locale! return; } diff --git a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java index 22bbb617b..2f9af04d6 100644 --- a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java +++ b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java @@ -53,7 +53,7 @@ public final class ChimaeraWing { return; } - if (!SkillUtils.cooldownOver(lastChimaeraWing * Misc.TIME_CONVERSION_FACTOR, Config.getInstance().getChimaeraCooldown(), player)) { + if (Config.getInstance().getChimaeraCooldown() > 0 && !SkillUtils.cooldownOver(lastChimaeraWing * Misc.TIME_CONVERSION_FACTOR, Config.getInstance().getChimaeraCooldown(), player)) { player.sendMessage(ChatColor.RED + "You need to wait before you can use this again! " + ChatColor.YELLOW + "(" + SkillUtils.calculateTimeLeft(lastChimaeraWing * Misc.TIME_CONVERSION_FACTOR, Config.getInstance().getChimaeraCooldown(), player) + ")"); //TODO Locale! return; } @@ -69,7 +69,6 @@ public final class ChimaeraWing { } if (Config.getInstance().getChimaeraPreventUseUnderground()) { - if (location.getY() < player.getWorld().getHighestBlockYAt(location)) { player.setItemInHand(new ItemStack(getChimaeraWing(amount - Config.getInstance().getChimaeraUseCost()))); player.sendMessage(LocaleLoader.getString("Item.ChimaeraWing.Fail")); @@ -79,11 +78,18 @@ public final class ChimaeraWing { return; } } + mcMMOPlayer.actualizeChimaeraCommenceLocation(player); long warmup = Config.getInstance().getChimaeraWarmup(); - player.sendMessage(ChatColor.GRAY + "Commencing teleport in " + ChatColor.GOLD + "(" + warmup + ")" + ChatColor.GRAY + " seconds, please stand still..."); //TODO Locale! - new ChimaeraWingWarmup(mcMMOPlayer).runTaskLater(mcMMO.p, 20 * warmup); + + if (warmup > 0) { + player.sendMessage(ChatColor.GRAY + "Commencing teleport in " + ChatColor.GOLD + "(" + warmup + ")" + ChatColor.GRAY + " seconds, please stand still..."); //TODO Locale! + new ChimaeraWingWarmup(mcMMOPlayer).runTaskLater(mcMMO.p, 20 * warmup); + } + else { + chimaeraExecuteTeleport(); + } } }