feat: check merge limits when completing auto-merge

- Closes #3748

Core/src/main/java/com/plotsquared/core/command/Auto.java

@@ -142,6 +142,14 @@ public class Auto extends SubCommand {
                 }
             }
         }
+        int maxMerge = Permissions.hasPermissionRange(player, Permission.PERMISSION_MERGE, Settings.Limit.MAX_PLOTS);
+        if (sizeX * sizeZ > maxMerge) {
+            player.sendMessage(
+                    TranslatableCaption.of("permission.no_permission"),
+                    Template.of("node", Permission.PERMISSION_MERGE + "." + (sizeX * sizeZ))
+            );
+            return false;
+        }
         return true;
     }
 

Core/src/main/java/com/plotsquared/core/command/Merge.java

@@ -124,7 +124,7 @@ public class Merge extends SubCommand {
             return false;
         }
         final int size = plot.getConnectedPlots().size();
-        int max = Permissions.hasPermissionRange(player, "plots.merge", Settings.Limit.MAX_PLOTS);
+        int max = Permissions.hasPermissionRange(player, Permission.PERMISSION_MERGE, Settings.Limit.MAX_PLOTS);
         PlotMergeEvent event =
                 this.eventDispatcher.callMerge(plot, direction, max, player);
         if (event.getEventResult() == Result.DENY) {

Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java

@@ -298,7 +298,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         int roadSchemHeight;
 
         if (schematic1 != null) {
-            roadSchemHeight = schematic1.getClipboard().getDimensions().getY();
+            roadSchemHeight = Math.max(
+                    schematic1.getClipboard().getDimensions().getY(),
+                    schematic2.getClipboard().getDimensions().getY()
+            );
             maxSchematicHeight = Math.max(roadSchemHeight, maxSchematicHeight);
             if (maxSchematicHeight == worldGenHeight) {
                 SCHEM_Y = getMinGenHeight();

build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 }
 
 group = "com.plotsquared"
-version = "6.10.2"
+version = "6.10.4-SNAPSHOT"
 
 subprojects {
     group = rootProject.group
@@ -65,7 +65,7 @@ subprojects {
     }
 
     dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.16"))
+        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.18"))
     }
 
     dependencies {