mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 11:45:51 +00:00
Fixed #1516
This commit is contained in:
parent
55b01b61f1
commit
b87354a39e
@ -146,7 +146,6 @@ public class TalismanListener implements Listener {
|
|||||||
*/
|
*/
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onBlockBreak(BlockBreakEvent e) {
|
public void onBlockBreak(BlockBreakEvent e) {
|
||||||
Collection<ItemStack> drops = new ArrayList<>();
|
|
||||||
ItemStack item = e.getPlayer().getInventory().getItemInMainHand();
|
ItemStack item = e.getPlayer().getInventory().getItemInMainHand();
|
||||||
int fortune = 1;
|
int fortune = 1;
|
||||||
Random random = ThreadLocalRandom.current();
|
Random random = ThreadLocalRandom.current();
|
||||||
@ -158,14 +157,10 @@ public class TalismanListener implements Listener {
|
|||||||
fortune = (e.getBlock().getType() == Material.LAPIS_ORE ? 4 + random.nextInt(5) : 1) * (fortune + 1);
|
fortune = (e.getBlock().getType() == Material.LAPIS_ORE ? 4 + random.nextInt(5) : 1) * (fortune + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!item.getEnchantments().containsKey(Enchantment.SILK_TOUCH) && e.getBlock().getType().toString().endsWith("_ORE") && Talisman.checkFor(e, (SlimefunItemStack) SlimefunItems.TALISMAN_MINER)) {
|
if (!item.getEnchantments().containsKey(Enchantment.SILK_TOUCH) && MaterialCollections.getAllOres().contains(e.getBlock().getType()) && Talisman.checkFor(e, (SlimefunItemStack) SlimefunItems.TALISMAN_MINER)) {
|
||||||
if (drops.isEmpty()) {
|
for (ItemStack drop : new ArrayList<>(e.getBlock().getDrops(item))) {
|
||||||
drops = e.getBlock().getDrops();
|
|
||||||
}
|
|
||||||
|
|
||||||
for (ItemStack drop : new ArrayList<>(drops)) {
|
|
||||||
if (!drop.getType().isBlock()) {
|
if (!drop.getType().isBlock()) {
|
||||||
drops.add(new CustomItem(drop, fortune * 2));
|
e.getPlayer().getInventory().addItem(new CustomItem(drop, (fortune * 2) - 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user