Merge remote-tracking branch 'origin/master'

Author: Ghost-chu

pom.xml

@@ -735,7 +735,7 @@
         <dependency>
             <groupId>com.songoda</groupId>
             <artifactId>skyblock</artifactId>
-            <version>2.2.13</version>
+            <version>2.3.30</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Find.java

@@ -95,9 +95,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                     }
                 }
                 if (excludeOutOfStock) {
-                    if (shop.isSelling() && shop.getRemainingStock() == 0) {
-                        continue;
-                    } else if (shop.isBuying() && shop.getRemainingSpace() == 0) {
+                    if ((shop.isSelling() && shop.getRemainingStock() == 0) || (shop.isBuying() && shop.getRemainingSpace() == 0)) {
                         continue;
                     }
                 }

src/main/java/org/maxgamer/quickshop/database/SimpleDatabaseHelper.java

@@ -294,11 +294,11 @@ public SimpleWarpedResultSet selectAllMessages() throws SQLException {
     @Override
     public SimpleWarpedResultSet selectTable(String table) throws SQLException {
         DatabaseConnection databaseConnection = manager.getDatabase().getConnection();
-        try (Statement st = databaseConnection.get().createStatement()) {
-            String sql = "SELECT * FROM " + plugin.getDbPrefix() + table;
-            ResultSet resultSet = st.executeQuery(sql);
-            return new SimpleWarpedResultSet(st, resultSet, databaseConnection);
-        }
+        Statement st = databaseConnection.get().createStatement();
+        String sql = "SELECT * FROM " + plugin.getDbPrefix() + table;
+        ResultSet resultSet = st.executeQuery(sql);
+        //Resource closes will complete in this class
+        return new SimpleWarpedResultSet(st, resultSet, databaseConnection);
     }
 
     @Override

src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java

@@ -141,8 +141,9 @@ private void postControlPanel(PlayerInteractEvent e) {
                 MsgUtil.sendControlPanelInfo(p, Objects.requireNonNull(plugin.getShopManager().getShop(block.getLocation())));
                 this.playClickSound(e.getPlayer());
                 Objects.requireNonNull(plugin.getShopManager().getShop(block.getLocation())).setSignText();
+                //Prevent use item by ancient
                 if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                    e.setCancelled(true);
+                    e.setUseItemInHand(Event.Result.DENY);
                 }
             }
         }
@@ -188,7 +189,8 @@ private void postTrade(PlayerInteractEvent e) {
             if (!InteractUtil.check(InteractUtil.Action.TRADE, p.isSneaking())) {
                 return;
             }
-            e.setCancelled(true);
+            //Prevent use item by ancient
+            e.setUseItemInHand(Event.Result.DENY);
             shop.onClick();
             this.playClickSound(e.getPlayer());
             // Text menu
@@ -282,8 +284,9 @@ else if (e.useInteractedBlock() == Event.Result.ALLOW
             final SimpleInfo info = new SimpleInfo(b.getLocation(), ShopAction.CREATE, e.getItem(), last, false);
             plugin.getShopManager().getActions().put(p.getUniqueId(), info);
             plugin.text().of(p, "how-much-to-trade-for", MsgUtil.getTranslateText(Objects.requireNonNull(e.getItem())), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(p, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
+            //Prevent use item by ancient
             if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                e.setCancelled(true);
+                e.setUseItemInHand(Event.Result.DENY);
             }
         }
     }