From a2c24b69ff2bf449175e6f535e73346b557fc2ab Mon Sep 17 00:00:00 2001 From: Maik E Date: Sun, 31 Dec 2023 15:30:59 +0100 Subject: [PATCH] Refactor sign checking method in ChestShop plugin Replaced the isLegacyValid method with isChestShop in various classes for more accurate sign validation in the ChestShop plugin. This enhances the clarity of the code, allowing for easier understanding and debugging in the future. --- .../com/Acrobot/ChestShop/Listeners/Block/BlockPlace.java | 2 +- .../Acrobot/ChestShop/Listeners/Block/Break/SignBreak.java | 4 ++-- .../com/Acrobot/ChestShop/Listeners/Block/SignCreate.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/Block/BlockPlace.java b/src/main/java/com/Acrobot/ChestShop/Listeners/Block/BlockPlace.java index 29d73c2b5..19bb4d731 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/Block/BlockPlace.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/Block/BlockPlace.java @@ -53,7 +53,7 @@ public static void onChestPlace(BlockPlaceEvent event) { public static void onPlaceAgainstSign(BlockPlaceEvent event) { Block against = event.getBlockAgainst(); - if (!ChestShopSign.isLegacyValid(against)) { + if (!ChestShopSign.isChestShop(against)) { return; } diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/Block/Break/SignBreak.java b/src/main/java/com/Acrobot/ChestShop/Listeners/Block/Break/SignBreak.java index 64628c33a..2f85334ea 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/Block/Break/SignBreak.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/Block/Break/SignBreak.java @@ -52,7 +52,7 @@ public static void onSign(BlockPhysicsEvent event) { Sign sign = (Sign) block.getState(); Block attachedBlock = BlockUtil.getAttachedBlock(sign); - if (attachedBlock.getType() == Material.AIR && ChestShopSign.isLegacyValid(sign)) { + if (attachedBlock.getType() == Material.AIR && ChestShopSign.isChestShop(sign)) { if (!block.hasMetadata(METADATA_NAME)) { return; } @@ -70,7 +70,7 @@ public static void onSignBreak(BlockBreakEvent event) { @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) public static void onBrokenSign(BlockBreakEvent event) { - if (ChestShopSign.isLegacyValid(event.getBlock())) { + if (ChestShopSign.isChestShop(event.getBlock())) { sendShopDestroyedEvent((Sign) event.getBlock().getState(), event.getPlayer()); } } diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/Block/SignCreate.java b/src/main/java/com/Acrobot/ChestShop/Listeners/Block/SignCreate.java index f790eaeef..dffadb669 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/Block/SignCreate.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/Block/SignCreate.java @@ -25,7 +25,7 @@ public class SignCreate implements Listener { public static void onSignChange(SignChangeEvent event) { Block signBlock = event.getBlock(); if (event.getSide() == Side.BACK) { - if (ChestShopSign.isLegacyValid(signBlock)) { + if (ChestShopSign.isChestShop(signBlock)) { event.setCancelled(true); } return;