浏览代码

Fixed a bug where Salvage was giving back too many materials

nossr50 6 年之前
父节点
当前提交
c6a4cbd715
共有 3 个文件被更改,包括 6 次插入3 次删除
  1. 3 0
      Changelog.txt
  2. 1 1
      pom.xml
  3. 2 2
      src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java

+ 3 - 0
Changelog.txt

@@ -7,6 +7,9 @@ Key:
   ! Change
   ! Change
   - Removal
   - Removal
 
 
+Version 2.1.6
+    Fixed a bug where Salvage was giving back too many resources
+
 Version 2.1.5
 Version 2.1.5
     mcMMO no longer ignores cancelled events relating to the player left or right clicking
     mcMMO no longer ignores cancelled events relating to the player left or right clicking
 
 

+ 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.5</version>
+    <version>2.1.6-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>

+ 2 - 2
src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java

@@ -103,8 +103,8 @@ public class SalvageManager extends SkillManager {
             return;
             return;
         }
         }
 
 
-        //Amount of materials to salvage based on rank
-        salvageableAmount = getSalvageableAmount();
+        salvageableAmount = Math.min(salvageableAmount, getSalvageableAmount()); // Always get at least something back, if you're capable of salvaging it.
+
 
 
         player.getInventory().setItemInMainHand(new ItemStack(Material.AIR));
         player.getInventory().setItemInMainHand(new ItemStack(Material.AIR));
         location.add(0.5, 1, 0.5);
         location.add(0.5, 1, 0.5);