From 2bdf8b6b48b4d8bd94d16e4ff79f04e826ffa129 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Sun, 7 Jul 2024 15:17:32 +0200 Subject: [PATCH] Remove temporary debug logging in RotateBlockEvent & fixed drip leaf & iron trap door rotation The update primarily eradicates numerous debug logging lines in the RotateBlockEvent class. This cleanup improves the readability of the code and enhances performance by reducing unnecessary logging operations. The "toggleDripLeaf" and "toggleTrapDoor" methods have also been updated to verify block data. --- .../event_listeners/RotateBlockEvent.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/alttd/playerutils/event_listeners/RotateBlockEvent.java b/src/main/java/com/alttd/playerutils/event_listeners/RotateBlockEvent.java index 83be0d8..86b9771 100644 --- a/src/main/java/com/alttd/playerutils/event_listeners/RotateBlockEvent.java +++ b/src/main/java/com/alttd/playerutils/event_listeners/RotateBlockEvent.java @@ -17,14 +17,12 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; -import org.slf4j.LoggerFactory; import java.util.*; import java.util.stream.Collectors; public class RotateBlockEvent implements Listener { - private static final org.slf4j.Logger log = LoggerFactory.getLogger(RotateBlockEvent.class); private final HashSet rotateEnabled = new HashSet<>(); private final Logger logger; private static final List VALID_FOUR_STATES = List.of(BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST); @@ -66,11 +64,9 @@ public class RotateBlockEvent implements Listener { logger.debug(String.format("Material %s with action %s", type, event.getAction().isLeftClick() ? "left click" : "right click")); if (type.equals(Material.IRON_TRAPDOOR) && event.getAction().isLeftClick()) { event.setCancelled(true); - logger.debug("Toggling trap door"); toggleTrapDoor(block, player); - } else if (Tag.BIG_DRIPLEAF_PLACEABLE.isTagged(type) && event.getAction().isLeftClick()) { + } else if (type.equals(Material.BIG_DRIPLEAF) && event.getAction().isLeftClick()) { event.setCancelled(true); - logger.debug("Toggling drip leaf"); toggleDripLeaf(block, player); } else if (Tag.STAIRS.isTagged(type)) { event.setCancelled(true); @@ -94,7 +90,7 @@ public class RotateBlockEvent implements Listener { } private void toggleDripLeaf(Block block, Player player) { - if (!(block instanceof BigDripleaf bigDripleaf)) { + if (!(block.getBlockData() instanceof BigDripleaf bigDripleaf)) { return; } @@ -105,31 +101,25 @@ public class RotateBlockEvent implements Listener { BigDripleaf.Tilt[] values = BigDripleaf.Tilt.values(); int ordinal = bigDripleaf.getTilt().ordinal(); - logger.debug("drip leaf is on tilt %d".formatted(ordinal)); if (++ordinal == values.length) { ordinal = 0; } bigDripleaf.setTilt(values[ordinal]); - logger.debug("drip leaf set to tilt %d".formatted(ordinal)); block.setBlockAndForget(bigDripleaf); - logger.debug("drip leaf set"); } private void toggleTrapDoor(Block block, Player player) { - if (!(block instanceof TrapDoor trapDoor)) { - logger.debug("Trap door early return 1"); + if (!(block.getBlockData() instanceof TrapDoor trapDoor)) { return; } if (cannotBuild(block, player)) { - logger.debug("Trap door early return 2"); return; } - logger.debug("Trap door is %s".formatted(trapDoor.isOpen() ? "open" : "closed")); trapDoor.setOpen(!trapDoor.isOpen()); - logger.debug(String.format("Trap door set to %s", trapDoor.isOpen() ? "open" : "close")); + block.setBlockAndForget(trapDoor); } private void toggleRails(Block block, Player player) {