diff --git a/Changelog.txt b/Changelog.txt index c042d3b7b..b00c14c53 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,6 @@ +Version 2.1.71 + Salvage will now always ask for confirmation before breaking your items (instead of only asking for enchanted items) + Version 2.1.70 Added new DatabaseAPI to the API package, has features relating to database operations Fixed a bug where shulker boxes (without colors) would activate tool ready messages diff --git a/pom.xml b/pom.xml index 87d1a18ec..f2f38ed21 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.70 + 2.1.71-SNAPSHOT mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 6b29f41e8..97622535f 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -619,7 +619,7 @@ public class PlayerListener implements Listener { event.setCancelled(true); // Make sure the player knows what he's doing when trying to salvage an enchanted item - if (!(heldItem.getEnchantments().size() > 0) || salvageManager.checkConfirmation(true)) { + if (salvageManager.checkConfirmation(true)) { SkillUtils.handleAbilitySpeedDecrease(player); salvageManager.handleSalvage(block.getLocation(), heldItem); player.updateInventory();