From 2accedf264bb372f315bef13ae27565d58608abe Mon Sep 17 00:00:00 2001 From: Tjorven Liebe <32434395+Tjorven-Liebe@users.noreply.github.com> Date: Sun, 18 May 2025 14:04:39 +0200 Subject: [PATCH] fix: Don't use list to proof block is copper. Instead check with name (#4641) * fix: Don't use list to proof block is copper. Instead check with name * chore: Code-Cleanup --- .../listener/BlockEventListener117.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java index 16293a05b..488891106 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java @@ -28,7 +28,6 @@ import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag; import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag; import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag; import com.plotsquared.core.util.PlotFlagUtil; -import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.entity.Item; @@ -42,31 +41,11 @@ import org.bukkit.event.block.BlockReceiveGameEvent; import java.util.List; import java.util.Objects; -import java.util.Set; import java.util.UUID; @SuppressWarnings("unused") public class BlockEventListener117 implements Listener { - private static final Set COPPER_OXIDIZING = Set.of( - Material.COPPER_BLOCK, - Material.EXPOSED_COPPER, - Material.WEATHERED_COPPER, - Material.OXIDIZED_COPPER, - Material.CUT_COPPER, - Material.EXPOSED_CUT_COPPER, - Material.WEATHERED_CUT_COPPER, - Material.OXIDIZED_CUT_COPPER, - Material.CUT_COPPER_STAIRS, - Material.EXPOSED_CUT_COPPER_STAIRS, - Material.WEATHERED_CUT_COPPER_STAIRS, - Material.OXIDIZED_CUT_COPPER_STAIRS, - Material.CUT_COPPER_SLAB, - Material.EXPOSED_CUT_COPPER_SLAB, - Material.WEATHERED_CUT_COPPER_SLAB, - Material.OXIDIZED_CUT_COPPER_SLAB - ); - @Inject public BlockEventListener117() { } @@ -184,7 +163,7 @@ public class BlockEventListener117 implements Listener { if (plot == null) { return; } - if (COPPER_OXIDIZING.contains(event.getNewState().getType())) { + if (event.getNewState().getType().name().contains("COPPER")) { if (!plot.getFlag(CopperOxideFlag.class)) { plot.debug("Copper could not oxide because copper-oxide = false"); event.setCancelled(true);