From 54f3530658ac834c1f3a341bf71d053093ddd4de Mon Sep 17 00:00:00 2001 From: Jeffrey Date: Sun, 20 Aug 2023 14:16:55 +0200 Subject: [PATCH] requested changes --- .../slimefun4/implementation/items/tools/ExplosiveTool.java | 2 +- .../slimefun4/integrations/IntegrationsManager.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java index fab595cdcb..eb1be0bf45 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java @@ -138,7 +138,7 @@ protected boolean canBreak(@Nonnull Player p, @Nonnull Block b) { return false; } else if (!b.getWorld().getWorldBorder().isInside(b.getLocation())) { return false; - } else if (CustomBlock.byAlreadyPlaced(b) == null) { + } else if (Slimefun.getIntegrations().isCustomBlock(b)) { return false; } else { return Slimefun.getProtectionManager().hasPermission(p, b.getLocation(), Interaction.BREAK_BLOCK); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java b/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java index 579e5bfb69..5063884c56 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java @@ -6,6 +6,7 @@ import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; +import dev.lone.itemsadder.api.CustomBlock; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Server; @@ -236,7 +237,7 @@ public boolean isEventFaked(@Nonnull Event event) { public boolean isCustomBlock(@Nonnull Block block) { if (isItemsAdderInstalled) { try { - return ItemsAdder.isCustomBlock(block); + return CustomBlock.byAlreadyPlaced(block) != null; } catch (Exception | LinkageError x) { logError("ItemsAdder", x); }