fix wrong way to get face

MrXiaoM · Feb 16, 2025 · c1a24de · c1a24de
1 parent d6f778f
commit c1a24de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/top/mrxiaom/catsense/ContainerListener.java b/src/main/java/top/mrxiaom/catsense/ContainerListener.java
@@ -91,7 +91,9 @@ public void onBlockClick(PlayerInteractEvent event) {
                 || (player.isSneaking() && event.getAction().equals(Action.LEFT_CLICK_BLOCK)))) {
             Sign sign = (Sign) block.getState();
             // 获取牌子贴着的方块
-            block = block.getRelative(((org.bukkit.material.Sign) sign.getData()).getFacing().getOppositeFace(), 1);
+            BlockFace face = getFace(sign);
+            if (face == null) return;
+            block = block.getRelative(face.getOppositeFace(), 1);
             if (!isTargetContainer(block)) return;
             for (String line : sign.getLines()) {
                 if (line.equals(signKey)) {

diff --git a/src/main/java/top/mrxiaom/catsense/LocksListener.java b/src/main/java/top/mrxiaom/catsense/LocksListener.java
@@ -95,7 +95,9 @@ public void onSignChange(SignChangeEvent event) {
                 && header.equals(event.getLine(0))) {
             Player player = event.getPlayer();
             // 获取贴着牌子的方块另一边是否有收费门牌子
-            Block oppositeBlock = event.getBlock().getRelative(((org.bukkit.material.Sign) event.getBlock().getState().getData()).getFacing().getOppositeFace(), 2);
+            BlockFace signFace = getFace(event.getBlock().getState());
+            if (signFace == null) return;
+            Block oppositeBlock = event.getBlock().getRelative(signFace.getOppositeFace(), 2);
             if(oppositeBlock.getType().name().contains("WALL_SIGN")) {
                 BlockState sign = oppositeBlock.getState();
                 if ((sign instanceof Sign) && ((Sign) sign).getLine(0).equalsIgnoreCase(headerCheck)) {
@@ -155,7 +157,7 @@ public static boolean isTheSameFacing(Block block, Sign sign) {
     }
 
     @SuppressWarnings({"deprecation"})
-    public static BlockFace getFace(Sign sign) {
+    public static BlockFace getFace(BlockState sign) {
         if (isPresent("org.bukkit.block.data.BlockData")) {
             BlockData data = sign.getBlockData();
             if (data instanceof org.bukkit.block.data.Directional) {