Merge prefer-silk-touch

This commit is contained in:
Logan Darklock 2019-09-01 15:02:09 -07:00
commit 6411fd80aa
No known key found for this signature in database
GPG Key ID: B8C37CEDE1AC60EA
1 changed files with 2 additions and 1 deletions

View File

@ -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;