Ore silk touch fix

This commit is contained in:
paulevsGitch 2020-11-19 11:09:56 +03:00
parent 348eaf2b24
commit 2a36985947

View file

@ -51,11 +51,15 @@ public class BlockOre extends OreBlock {
if (EnchantmentHelper.getLevel(Enchantments.SILK_TOUCH, tool) > 0) { if (EnchantmentHelper.getLevel(Enchantments.SILK_TOUCH, tool) > 0) {
return Collections.singletonList(new ItemStack(this)); return Collections.singletonList(new ItemStack(this));
} }
int enchantment = EnchantmentHelper.getLevel(Enchantments.SILK_TOUCH, tool);
if (enchantment > 0) {
return Lists.newArrayList(new ItemStack(this));
}
int count = 0; int count = 0;
int fortune = EnchantmentHelper.getLevel(Enchantments.FORTUNE, tool); enchantment = EnchantmentHelper.getLevel(Enchantments.FORTUNE, tool);
if (fortune > 0) { if (enchantment > 0) {
int min = MathHelper.clamp(minCount + fortune, minCount, maxCount); int min = MathHelper.clamp(minCount + enchantment, minCount, maxCount);
int max = maxCount + (fortune / Enchantments.FORTUNE.getMaxLevel()); int max = maxCount + (enchantment / Enchantments.FORTUNE.getMaxLevel());
if (min == max) { if (min == max) {
return Lists.newArrayList(new ItemStack(dropItem, max)); return Lists.newArrayList(new ItemStack(dropItem, max));
} }