diff --git a/Changelog.txt b/Changelog.txt index 53227539a..adaf42ab0 100644 --- a/Changelog.txt +++ b/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 diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java index 18547bd99..9b6a68881 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -437,8 +437,7 @@ public class HerbalismManager extends SkillManager { } private HashSet getBrokenChorusBlocks(BlockState originalBreak) { - HashSet traversedBlocks = grabChorusTreeBrokenBlocksRecursive(originalBreak.getBlock(), new HashSet<>()); - return traversedBlocks; + return grabChorusTreeBrokenBlocksRecursive(originalBreak.getBlock(), new HashSet<>()); } private HashSet grabChorusTreeBrokenBlocksRecursive(Block currentBlock, HashSet traversed) { diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java index 327cfcd95..063fd746e 100644 --- a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java +++ b/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; }