From 46003a10267e28f8219c7c5bde7c03871454d8a1 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 15 Mar 2020 13:16:49 +0100 Subject: [PATCH] Fixed #1648 --- CHANGELOG.md | 1 + .../implementation/items/tools/SmeltersPickaxe.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b104aafd..ee71c698a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ * Fixed some languages showing numbers larger than 100% * Fixed #1570 * Fixed #1686 +* Fixed #1648 ## Release Candidate 9 (07 Mar 2020) 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 8d4ced090..39cba9743 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 @@ -14,12 +14,13 @@ import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SimpleSlimefunItem; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.DamageableItem; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockBreakHandler; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; -public class SmeltersPickaxe extends SimpleSlimefunItem { +public class SmeltersPickaxe extends SimpleSlimefunItem implements DamageableItem { public SmeltersPickaxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); @@ -41,6 +42,7 @@ public class SmeltersPickaxe extends SimpleSlimefunItem { if (!Slimefun.hasUnlocked(e.getPlayer(), SmeltersPickaxe.this, true)) return true; Collection blockDrops = e.getBlock().getDrops(getItem()); + for (ItemStack drop : blockDrops) { if (drop != null) { ItemStack output = drop; @@ -56,6 +58,8 @@ public class SmeltersPickaxe extends SimpleSlimefunItem { } } + damageItem(e.getPlayer(), item); + return true; } else return false; @@ -63,4 +67,9 @@ public class SmeltersPickaxe extends SimpleSlimefunItem { }; } + @Override + public boolean isDamageable() { + return true; + } + }