From 7cdb87f981ba1cb586beffdc255a6ef66d400374 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 15 Aug 2021 19:58:19 +0100 Subject: [PATCH] Fixed broken Blast Mining / Lumberjack durability --- .../enchantments/ecoenchants/normal/BlastMining.java | 6 ++++++ .../enchantments/ecoenchants/normal/Lumberjack.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java index 3995ad7c..5caccebe 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java @@ -13,6 +13,7 @@ import org.bukkit.Particle; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.player.PlayerItemBreakEvent; import org.bukkit.event.player.PlayerItemDamageEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; @@ -115,6 +116,11 @@ public class BlastMining extends EcoEnchant { assert wayAfterMeta != null; ((Damageable) wayAfterMeta).setDamage(((Damageable) wayAfterMeta).getDamage() + mockEvent.getDamage()); itemStack.setItemMeta(wayAfterMeta); + if (((Damageable) wayAfterMeta).getDamage() >= itemStack.getType().getMaxDurability()) { + PlayerItemBreakEvent breakEvent = new PlayerItemBreakEvent(player, itemStack); + Bukkit.getPluginManager().callEvent(breakEvent); + itemStack.setAmount(0); + } } AnticheatManager.unexemptPlayer(player); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java index 7d7e79c3..c80dd971 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java @@ -11,6 +11,7 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.player.PlayerItemBreakEvent; import org.bukkit.event.player.PlayerItemDamageEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; @@ -86,6 +87,11 @@ public class Lumberjack extends EcoEnchant { assert wayAfterMeta != null; ((Damageable) wayAfterMeta).setDamage(((Damageable) wayAfterMeta).getDamage() + mockEvent.getDamage()); itemStack.setItemMeta(wayAfterMeta); + if (((Damageable) wayAfterMeta).getDamage() >= itemStack.getType().getMaxDurability()) { + PlayerItemBreakEvent breakEvent = new PlayerItemBreakEvent(player, itemStack); + Bukkit.getPluginManager().callEvent(breakEvent); + itemStack.setAmount(0); + } } AnticheatManager.unexemptPlayer(player);