Always use fast search method

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -1921,6 +1921,7 @@ private void updateConfig(int selectedVersion) throws IOException {
             getConfig().set("purge.banned", true);
             getConfig().set("purge.skip-op", true);
             getConfig().set("purge.return-create-fee", true);
+            getConfig().set("shop.use-fast-shop-search-algorithm",null);
             getConfig().set("config-version", ++selectedVersion);
         }
 

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

@@ -82,7 +82,7 @@ public class ShopManager implements Reloadable {
     private Trader cacheUnlimitedShopAccount;
     @Getter
     private PriceLimiter priceLimiter;
-    private boolean useFastShopSearchAlgorithm;
+    //private boolean useFastShopSearchAlgorithm;
     private boolean useOldCanBuildAlgorithm;
     private boolean autoSign;
 
@@ -95,8 +95,8 @@ public ShopManager(@NotNull QuickShop plugin) {
     }
 
     private void init() {
-        this.useFastShopSearchAlgorithm =
-                plugin.getConfig().getBoolean("shop.use-fast-shop-search-algorithm", false);
+//        this.useFastShopSearchAlgorithm =
+//                plugin.getConfig().getBoolean("shop.use-fast-shop-search-algorithm", false);
         Util.debugLog("Loading caching tax account...");
         String taxAccount = plugin.getConfig().getString("tax-account", "tax");
         if (!taxAccount.isEmpty()) {
@@ -386,64 +386,64 @@ public void createShop(@NotNull Shop shop, @NotNull Info info) {
             return null;
         }
 
-        if (this.useFastShopSearchAlgorithm) {
+        //if (this.useFastShopSearchAlgorithm) {
             return getShopIncludeAttached_Fast(loc, false, useCache);
-        } else {
-            return getShopIncludeAttached_Classic(loc);
-        }
+      //  } else {
+      //      return getShopIncludeAttached_Classic(loc);
+       // }
     }
 
-    public @Nullable Shop getShopIncludeAttached_Classic(@NotNull Location loc) {
-        @Nullable Shop shop;
-        // Get location's chunk all shops
-        @Nullable Map<Location, Shop> inChunk = getShops(loc.getChunk());
-        // Found some shops in this chunk.
-        if (inChunk != null) {
-            shop = inChunk.get(loc);
-            if (shop != null) {
-                // Okay, shop was founded.
-                return shop;
-            }
-            // Ooops, not founded that shop in this chunk.
-        }
-        @Nullable Block secondHalfShop = Util.getSecondHalf(loc.getBlock());
-        if (secondHalfShop != null) {
-            inChunk = getShops(secondHalfShop.getChunk());
-            if (inChunk != null) {
-                shop = inChunk.get(secondHalfShop.getLocation());
-                if (shop != null) {
-                    // Okay, shop was founded.
-                    return shop;
-                }
-                // Oooops, no any shops matched.
-            }
-        }
-
-        // only check if is sign
-        Block block = loc.getBlock();
-        BlockState state = PaperLib.getBlockState(loc.getBlock(), false).getState();
-        if (state instanceof Sign) {
-            // If that chunk nothing we founded, we should check it is attached.
-            @Nullable Block attachedBlock = Util.getAttached(block);
-            // Check is attached on some block.
-            if (attachedBlock == null) {
-                // Nope
-                return null;
-            } else {
-                // Okay we know it on some blocks.
-                // We need set new location and chunk.
-                inChunk = getShops(attachedBlock.getChunk());
-                // Found some shops in this chunk
-                if (inChunk != null) {
-                    shop = inChunk.get(attachedBlock.getLocation());
-                    // Okay, shop was founded.
-                    return shop;
-                    // Oooops, no any shops matched.
-                }
-            }
-        }
-        return null;
-    }
+//    public @Nullable Shop getShopIncludeAttached_Classic(@NotNull Location loc) {
+//        @Nullable Shop shop;
+//        // Get location's chunk all shops
+//        @Nullable Map<Location, Shop> inChunk = getShops(loc.getChunk());
+//        // Found some shops in this chunk.
+//        if (inChunk != null) {
+//            shop = inChunk.get(loc);
+//            if (shop != null) {
+//                // Okay, shop was founded.
+//                return shop;
+//            }
+//            // Ooops, not founded that shop in this chunk.
+//        }
+//        @Nullable Block secondHalfShop = Util.getSecondHalf(loc.getBlock());
+//        if (secondHalfShop != null) {
+//            inChunk = getShops(secondHalfShop.getChunk());
+//            if (inChunk != null) {
+//                shop = inChunk.get(secondHalfShop.getLocation());
+//                if (shop != null) {
+//                    // Okay, shop was founded.
+//                    return shop;
+//                }
+//                // Oooops, no any shops matched.
+//            }
+//        }
+//
+//        // only check if is sign
+//        Block block = loc.getBlock();
+//        BlockState state = PaperLib.getBlockState(loc.getBlock(), false).getState();
+//        if (state instanceof Sign) {
+//            // If that chunk nothing we founded, we should check it is attached.
+//            @Nullable Block attachedBlock = Util.getAttached(block);
+//            // Check is attached on some block.
+//            if (attachedBlock == null) {
+//                // Nope
+//                return null;
+//            } else {
+//                // Okay we know it on some blocks.
+//                // We need set new location and chunk.
+//                inChunk = getShops(attachedBlock.getChunk());
+//                // Found some shops in this chunk
+//                if (inChunk != null) {
+//                    shop = inChunk.get(attachedBlock.getLocation());
+//                    // Okay, shop was founded.
+//                    return shop;
+//                    // Oooops, no any shops matched.
+//                }
+//            }
+//        }
+//        return null;
+//    }
 
     public void bakeShopRuntimeRandomUniqueIdCache(@NotNull Shop shop) {
         shopRuntimeUUIDCaching.put(shop.getRuntimeRandomUniqueId(), shop);

src/main/resources/config.yml

@@ -432,9 +432,9 @@ shop:
   #THIS MAY BREAK SOMETHING!
   allow-free-shop: false
 
-  #Use fast algorithm for ShopManager#getShopIncludeAttached, 
-  #This should drastically improve performance.
-  use-fast-shop-search-algorithm: true
+#  #Use fast algorithm for ShopManager#getShopIncludeAttached,
+#  #This should drastically improve performance.
+#  use-fast-shop-search-algorithm: true
 
   #The shop ongoing fee.
   #If the shop owner doesn't have enough money, the shop will automatically be removed.