Browse Source

Salvage always asks for confirmation before breaking an item

nossr50 6 years ago
parent
commit
77fbf7f51e
3 changed files with 5 additions and 2 deletions
  1. 3 0
      Changelog.txt
  2. 1 1
      pom.xml
  3. 1 1
      src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

+ 3 - 0
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
 Version 2.1.70
     Added new DatabaseAPI to the API package, has features relating to database operations
     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
     Fixed a bug where shulker boxes (without colors) would activate tool ready messages

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.70</version>
+    <version>2.1.71-SNAPSHOT</version>
     <name>mcMMO</name>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
     <scm>

+ 1 - 1
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -619,7 +619,7 @@ public class PlayerListener implements Listener {
                         event.setCancelled(true);
                         event.setCancelled(true);
 
 
                         // Make sure the player knows what he's doing when trying to salvage an enchanted item
                         // 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);
                             SkillUtils.handleAbilitySpeedDecrease(player);
                             salvageManager.handleSalvage(block.getLocation(), heldItem);
                             salvageManager.handleSalvage(block.getLocation(), heldItem);
                             player.updateInventory();
                             player.updateInventory();