when looking for attached signs to a chest, check if they are connected

Brokkonaut · Jul 14, 2022 · dba6e74 · dba6e74
1 parent 27e7a5f
commit dba6e74
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/main/java/com/Acrobot/ChestShop/Utils/uBlock.java b/src/main/java/com/Acrobot/ChestShop/Utils/uBlock.java
@@ -82,6 +82,15 @@ public static Container findConnectedChest(Sign sign) {
     }
 
     public static Container findConnectedChest(Sign sign, boolean upgradeItems) {
+        Block chestBlock = findConnectedChestBlock(sign, upgradeItems);
+        return chestBlock == null ? null : (Container) chestBlock.getState();
+    }
+
+    public static Block findConnectedChestBlock(Sign sign) {
+        return findConnectedChestBlock(sign, false);
+    }
+
+    public static Block findConnectedChestBlock(Sign sign, boolean upgradeItems) {
         Block block = sign.getBlock();
         BlockFace signFace = null;
         BlockData data = sign.getBlockData();
@@ -93,7 +102,7 @@ public static Container findConnectedChest(Sign sign, boolean upgradeItems) {
                 if (upgradeItems) {
                     upgradeContainerItems(faceBlock);
                 }
-                return (Container) faceBlock.getState();
+                return faceBlock;
             }
         }
         for (BlockFace bf : SHOP_FACES) {
@@ -103,7 +112,7 @@ public static Container findConnectedChest(Sign sign, boolean upgradeItems) {
                     if (upgradeItems) {
                         upgradeContainerItems(faceBlock);
                     }
-                    return (Container) faceBlock.getState();
+                    return faceBlock;
                 }
             }
         }
@@ -156,7 +165,10 @@ private static Sign findAnyNearbyShopSign(Block block, Block ignoredSign) {
 
             Sign sign = (Sign) faceBlock.getState();
             if (ChestShopSign.isValid(sign)) {
-                return sign;
+                Block attachedTo = findConnectedChestBlock(sign);
+                if (attachedTo != null && attachedTo.equals(block)) {
+                    return sign;
+                }
             }
         }
         return null;