Merge prefer-silk-touch

2019-09-01 15:02:09 -07:00
parent 384b9b4704 0b953a237d
commit 6411fd80aa
1 changed files with 2 additions and 1 deletions
--- a/src/main/java/baritone/utils/ToolSet.java
+++ b/src/main/java/baritone/utils/ToolSet.java
@@ -117,7 +117,8 @@ public class ToolSet {
                bestSilkTouch = silkTouch;
            } else if (speed == highestSpeed) {
                int cost = getMaterialCost(itemStack);
-                if ((cost < lowestCost && (!preferSilkTouch || (!bestSilkTouch && silkTouch)))) {
+                if (cost < lowestCost && (silkTouch || !bestSilkTouch) ||
+                    (preferSilkTouch && !bestSilkTouch && silkTouch)) {
                    highestSpeed = speed;
                    best = i;
                    lowestCost = cost;