diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 70d15e79e..dd7fc4f8a 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -36,7 +36,6 @@ import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.AbilityType; import com.gmail.nossr50.datatypes.skills.SkillType; -import com.gmail.nossr50.events.fake.FakeBlockBreakEvent; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.party.ShareHandler; import com.gmail.nossr50.runnables.skills.BleedTimerTask; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java index 61aec5c66..46fc38b71 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -194,11 +194,10 @@ public class RepairManager extends SkillManager { public boolean checkConfirmation(int anvilId, boolean actualize) { Player player = getPlayer(); McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - - long LastUse = mcMMOPlayer.getLastAnvilUse(anvilId); + long lastUse = mcMMOPlayer.getLastAnvilUse(anvilId); // Don't use SkillUtils.cooldownOver() here since that also accounts for the cooldown perks - if ((((LastUse + 3) * Misc.TIME_CONVERSION_FACTOR) >= System.currentTimeMillis()) || !Config.getInstance().getRepairConfirmRequired()) { + if ((((lastUse + 3) * Misc.TIME_CONVERSION_FACTOR) >= System.currentTimeMillis()) || !Config.getInstance().getRepairConfirmRequired()) { return true; } @@ -211,10 +210,10 @@ public class RepairManager extends SkillManager { if (anvilId == Repair.repairAnvilId) { player.sendMessage(LocaleLoader.getString("Skills.ConfirmOrCancel", LocaleLoader.getString("Repair.Pretty.Name"))); } - - if (anvilId == Repair.salvageAnvilId) { + else if (anvilId == Repair.salvageAnvilId) { player.sendMessage(LocaleLoader.getString("Skills.ConfirmOrCancel", LocaleLoader.getString("Salvage.Pretty.Name"))); } + return false; }