Improve the code of recognizing shop sign

Author: sandtechnology

src/main/java/org/maxgamer/quickshop/api/shop/Shop.java

@@ -38,7 +38,6 @@
 import org.maxgamer.quickshop.shop.ShopSignStorage;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -561,42 +560,33 @@ default List<ComponentPackage> getSignText(String locale) {
      * @return Is shop info sign
      */
     default boolean isShopSign(@NotNull Sign sign) {
-        return isShopSign(sign, null);
-    }
-
-    /**
-     * Checks if a Sign is a ShopSign and also check if a ShopSign is specific shop's ShopSign.
-     *
-     * @param sign Target sign
-     * @param shop Target shop (null if you don't want check sign owner)
-     * @return Is specific shop's ShopSign.
-     */
-    default boolean isShopSign(@NotNull Sign sign, @Nullable Shop shop) {
         // Check for new shop sign
         String[] lines = sign.getLines();
         if (lines[0].isEmpty() && lines[1].isEmpty() && lines[2].isEmpty() && lines[3].isEmpty()) {
             return true;
         }
 
         // Check for exists shop sign (modern)
-        if (sign.getPersistentDataContainer().has(SHOP_NAMESPACED_KEY, ShopSignPersistentDataType.INSTANCE)) {
-            if (shop != null) {
-                ShopSignStorage shopSignStorage = sign.getPersistentDataContainer().get(SHOP_NAMESPACED_KEY, ShopSignPersistentDataType.INSTANCE);
-                return Objects.equals(shopSignStorage, new ShopSignStorage(getLocation().getWorld().getName(), getLocation().getBlockX(), getLocation().getBlockY(), getLocation().getBlockZ()));
-            }
-            return true;
+        ShopSignStorage shopSignStorage = sign.getPersistentDataContainer().get(SHOP_NAMESPACED_KEY, ShopSignPersistentDataType.INSTANCE);
+        if (shopSignStorage != null) {
+            return shopSignStorage.equals(getLocation().getWorld().getName(), getLocation().getBlockX(), getLocation().getBlockY(), getLocation().getBlockZ());
         }
 
         // Check for exists shop sign (legacy upgrade)
+        //Check if attached with the shop block
+        if (!isAttached(sign.getBlock())) {
+            return false;
+        }
+        //Check sign content
         if (lines[1].startsWith(SHOP_SIGN_PATTERN)) {
             return true;
         } else {
             if (!QuickShop.getInstance().getConfiguration().getOrDefault("legacy-updater.shop-sign", false)) {
                 return false;
             }
             String header = lines[0];
-            TextManager textManager=QuickShop.getInstance().text();
-            String ownerName=this.ownerName(true);
+            TextManager textManager = QuickShop.getInstance().text();
+            String ownerName = this.ownerName(true);
             //Raw text matching
             String adminShopHeader = textManager.of("signs.header", textManager.of("admin-shop").forLocale()).forLocale();
             String userShopHeader = textManager.of("signs.header", ownerName).forLocale();

src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java

@@ -1140,15 +1140,11 @@ public void setShopType(@NotNull ShopType newShopType) {
             if (!(state instanceof Sign)) {
                 continue;
             }
-            if (!isAttached(b)) {
-                continue;
-            }
             Sign sign = (Sign) state;
-            if (!isShopSign(sign)) {
-                continue;
+            if (isShopSign(sign)) {
+                claimShopSign(sign);
+                signs.add(sign);
             }
-            claimShopSign(sign);
-            signs.add(sign);
         }
 
         return signs;
@@ -1300,10 +1296,10 @@ public AbstractDisplayItem getDisplayItem() {
                     && plugin.getOpenInvPlugin() != null) { //FIXME: Need better impl
                 OpenInv openInv = ((OpenInv) plugin.getOpenInvPlugin());
                 return openInv.getSpecialEnderChest(
-                        Objects.requireNonNull(
-                                openInv.loadPlayer(
-                                        plugin.getServer().getOfflinePlayer(this.moderator.getOwner()))),
-                        plugin.getServer().getOfflinePlayer((this.moderator.getOwner())).isOnline())
+                                Objects.requireNonNull(
+                                        openInv.loadPlayer(
+                                                plugin.getServer().getOfflinePlayer(this.moderator.getOwner()))),
+                                plugin.getServer().getOfflinePlayer((this.moderator.getOwner())).isOnline())
                         .getBukkitInventory();
             }
         } catch (Exception e) {

src/main/java/org/maxgamer/quickshop/shop/ShopSignStorage.java

@@ -23,6 +23,8 @@
 import lombok.Builder;
 import lombok.Data;
 
+import java.util.Objects;
+
 /**
  * TODO This class used for storage the shop sign
  */
@@ -35,4 +37,7 @@ public class ShopSignStorage {
     private int x;
     private int y;
     private int z;
+    public boolean equals(String world, int x, int y, int z){
+        return Objects.equals(this.world,world)&&this.x==x&&this.y==y&&this.z==z;
+    }
 }