From 25d970ea9470ddf8a63026b0d32da63ec7bf236c Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 11 Jun 2020 09:34:29 +0200 Subject: [PATCH] Fixes #1971 --- CHANGELOG.md | 1 + .../implementation/items/tools/PickaxeOfVeinMining.java | 8 ++++---- .../implementation/items/tools/SmeltersPickaxe.java | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ec1d3590..6105ac3b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ * Fixed #1942 * Fixed #1943 * Fixed Nuclear Reactors accepting Lava as coolant +* Fixed #1971 ## Release Candidate 12 (27 May 2020) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#12 diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java index ee293b2a9..759bcf076 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java @@ -59,11 +59,11 @@ public class PickaxeOfVeinMining extends SimpleSlimefunItem { @Override public boolean onBlockBreak(BlockBreakEvent e, ItemStack item, int fortune, List drops) { - if (!Slimefun.hasUnlocked(e.getPlayer(), PickaxeOfVeinMining.this, true)) { - return true; - } - if (MaterialCollections.getAllOres().contains(e.getBlock().getType()) && isItem(item)) { + if (!Slimefun.hasUnlocked(e.getPlayer(), PickaxeOfVeinMining.this, true)) { + return true; + } + List blocks = Vein.find(e.getBlock(), maxBlocks.getValue(), MaterialCollections.getAllOres()); breakBlocks(e.getPlayer(), blocks, fortune); return true; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/SmeltersPickaxe.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/SmeltersPickaxe.java index 46433a9bf..45234a7db 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/SmeltersPickaxe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/SmeltersPickaxe.java @@ -38,11 +38,11 @@ public class SmeltersPickaxe extends SimpleSlimefunItem imple @Override public boolean onBlockBreak(BlockBreakEvent e, ItemStack item, int fortune, List drops) { - if (!Slimefun.hasUnlocked(e.getPlayer(), SmeltersPickaxe.this, true)) { - return true; - } - if (MaterialCollections.getAllOres().contains(e.getBlock().getType()) && isItem(item)) { + if (!Slimefun.hasUnlocked(e.getPlayer(), SmeltersPickaxe.this, true)) { + return true; + } + if (BlockStorage.hasBlockInfo(e.getBlock())) { return true; }