Browse Source

tweak and fix salvage result chance

nossr50 5 years ago
parent
commit
4e21f1a200

+ 1 - 0
Changelog.txt

@@ -1,4 +1,5 @@
 Version 2.1.115
+    Fixed a bug where Salvage always gave the best results
     Fixed an issue with arrows causing exceptions with players not yet having data loaded
     Spectral arrows are now tracked by mcMMO
     Use minimum level of salvageable properly

+ 1 - 2
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java

@@ -437,8 +437,7 @@ public class HerbalismManager extends SkillManager {
     }
 
     private HashSet<Block> getBrokenChorusBlocks(BlockState originalBreak) {
-        HashSet<Block> traversedBlocks = grabChorusTreeBrokenBlocksRecursive(originalBreak.getBlock(), new HashSet<>());
-        return traversedBlocks;
+        return grabChorusTreeBrokenBlocksRecursive(originalBreak.getBlock(), new HashSet<>());
     }
 
     private HashSet<Block> grabChorusTreeBrokenBlocksRecursive(Block currentBlock, HashSet<Block> traversed) {

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

@@ -118,8 +118,8 @@ public class SalvageManager extends SkillManager {
         for(int x = 0; x < potentialSalvageYield-1; x++) {
 
             if(RandomChanceUtil.rollDice(chanceOfSuccess, 100)) {
-                chanceOfSuccess-=2;
-                Math.max(chanceOfSuccess, 95);
+                chanceOfSuccess-=3;
+                chanceOfSuccess = Math.max(chanceOfSuccess, 90);
 
                 lotteryResults+=1;
             }