build: Release 6.2.1

This reverts commit f086826942.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -18,8 +18,6 @@ body:
       options:
         - Paper
         - Spigot
-        - Tuinity
-        - Purpur
     validations:
       required: true
 
@@ -29,6 +27,8 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
+        - '1.18.1'
+        - '1.18'
         - '1.17.1'
         - '1.16.5'
         - '1.15.2'

.github/workflows/build.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: "ubuntu-20.04"
     steps:
       - name: "Checkout Repository"
-        uses: "actions/checkout@v2.3.4"
+        uses: "actions/checkout@v2.4.0"
       - name: "Validate Gradle Wrapper"
         uses: "gradle/wrapper-validation-action@v1.0.4"
       - name: "Setup Java"
-        uses: "actions/setup-java@v2.3.1"
+        uses: "actions/setup-java@v2.4.0"
         with:
           distribution: "temurin"
           java-version: "17"
@@ -27,7 +27,7 @@ jobs:
           fi
       - name: "Publish Release"
         if: "${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}"
-        run: "./gradlew publishToSonatype closeSonatypeStagingRepository"
+        run: "./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository"
         env:
           ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}"
           ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}"

Bukkit/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
     implementation(libs.bstats)
 
     // Paper
-    compileOnlyApi(libs.paper)
+    compileOnly(libs.paper)
     implementation(libs.paperlib)
 
     // Plugins
@@ -32,7 +32,7 @@ dependencies {
         exclude(group = "org.bukkit")
         exclude(group = "org.spigotmc")
     }
-    compileOnlyApi(libs.fastasyncworldeditBukkit) { isTransitive = false }
+    compileOnly(libs.fastasyncworldeditBukkit) { isTransitive = false }
     testImplementation(libs.fastasyncworldeditBukkit) { isTransitive = false }
     compileOnly(libs.vault) {
         exclude(group = "org.bukkit")
@@ -95,9 +95,9 @@ tasks {
     withType<Javadoc> {
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://papermc.io/javadocs/paper/1.17/")
-        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.6/")
-        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.6/")
-        opt.links("https://jd.adventure.kyori.net/api/4.9.1/")
+        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.7/")
+        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.7/")
+        opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
         opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/")
         opt.links("https://checkerframework.org/api/")
     }

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -1180,6 +1180,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         return this.injector;
     }
 
+    @Override
+    public @NonNull PlotAreaManager plotAreaManager() {
+        return this.plotAreaManager;
+    }
+
     @NonNull
     @Override
     public Locale getLocale() {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java

@@ -318,8 +318,7 @@ public class BlockEventListener implements Listener {
             } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
                     pp.sendMessage(
-                            TranslatableCaption.of("permission.no_permission_event"),
-                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
+                            TranslatableCaption.of("done.building_restricted")
                     );
                     event.setCancelled(true);
                     return;
@@ -401,8 +400,7 @@ public class BlockEventListener implements Listener {
             } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
                 if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
                     plotPlayer.sendMessage(
-                            TranslatableCaption.of("permission.no_permission_event"),
-                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_OTHER))
+                            TranslatableCaption.of("done.building_restricted")
                     );
                     event.setCancelled(true);
                     return;

Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java

@@ -32,6 +32,7 @@ import com.plotsquared.core.location.Location;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.plot.world.SinglePlotArea;
 import com.plotsquared.core.util.ReflectionUtils.RefClass;
 import com.plotsquared.core.util.ReflectionUtils.RefField;
 import com.plotsquared.core.util.ReflectionUtils.RefMethod;
@@ -295,7 +296,7 @@ public class ChunkListener implements Listener {
         Chunk chunk = event.getChunk();
         if (Settings.Chunk_Processor.AUTO_TRIM) {
             String world = chunk.getWorld().getName();
-            if (this.plotAreaManager.hasPlotArea(world)) {
+            if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(world)) {
                 if (unloadChunk(world, chunk, true)) {
                     return;
                 }
@@ -365,8 +366,7 @@ public class ChunkListener implements Listener {
     }
 
     private void cleanChunk(final Chunk chunk) {
-        TaskManager.index.incrementAndGet();
-        final int currentIndex = TaskManager.index.get();
+        final int currentIndex = TaskManager.index.incrementAndGet();
         PlotSquaredTask task = TaskManager.runTaskRepeat(() -> {
             if (!chunk.isLoaded()) {
                 Objects.requireNonNull(TaskManager.removeTask(currentIndex)).cancel();

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -564,19 +564,31 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 return;
             }
             int border = area.getBorder();
+            int x1;
             if (x2 > border && this.tmpTeleport) {
-                to.setX(border - 1);
-                this.tmpTeleport = false;
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                pp.sendMessage(TranslatableCaption.of("border.border"));
-            }
-            if (x2 < -border && this.tmpTeleport) {
-                to.setX(-border + 1);
-                this.tmpTeleport = false;
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                pp.sendMessage(TranslatableCaption.of("border.border"));
+                if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
+                    to.setX(border - 1);
+                    this.tmpTeleport = false;
+                    player.teleport(event.getTo());
+                    this.tmpTeleport = true;
+                    pp.sendMessage(TranslatableCaption.of("border.denied"));
+                } else {
+                    pp.sendMessage(TranslatableCaption.of("border.bypass.exited"));
+                }
+            } else if (x2 < -border && this.tmpTeleport) {
+                if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
+                    to.setX(-border + 1);
+                    this.tmpTeleport = false;
+                    player.teleport(event.getTo());
+                    this.tmpTeleport = true;
+                    pp.sendMessage(TranslatableCaption.of("border.denied"));
+                } else {
+                    pp.sendMessage(TranslatableCaption.of("border.bypass.exited"));
+                }
+            } else if (((x1 = MathMan.roundInt(from.getX())) >= border && x2 <= border) || (x1 <= -border && x2 >= -border)) {
+                if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
+                    pp.sendMessage(TranslatableCaption.of("border.bypass.entered"));
+                }
             }
         }
         int z2;
@@ -643,18 +655,31 @@ public class PlayerEventListener extends PlotListener implements Listener {
                 return;
             }
             int border = area.getBorder();
+            int z1;
             if (z2 > border && this.tmpTeleport) {
-                to.setZ(border - 1);
-                this.tmpTeleport = false;
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                pp.sendMessage(TranslatableCaption.of("border.border"));
+                if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
+                    to.setZ(border - 1);
+                    this.tmpTeleport = false;
+                    player.teleport(event.getTo());
+                    this.tmpTeleport = true;
+                    pp.sendMessage(TranslatableCaption.of("border.denied"));
+                } else {
+                    pp.sendMessage(TranslatableCaption.of("border.bypass.exited"));
+                }
             } else if (z2 < -border && this.tmpTeleport) {
-                to.setZ(-border + 1);
-                this.tmpTeleport = false;
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                pp.sendMessage(TranslatableCaption.of("border.border"));
+                if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
+                    to.setZ(-border + 1);
+                    this.tmpTeleport = false;
+                    player.teleport(event.getTo());
+                    this.tmpTeleport = true;
+                    pp.sendMessage(TranslatableCaption.of("border.denied"));
+                } else {
+                    pp.sendMessage(TranslatableCaption.of("border.bypass.exited"));
+                }
+            } else if (((z1 = MathMan.roundInt(from.getZ())) >= border && z2 <= border) || (z1 <= -border && z2 >= -border)) {
+                if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
+                    pp.sendMessage(TranslatableCaption.of("border.bypass.entered"));
+                }
             }
         }
     }
@@ -960,8 +985,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
             if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
                     pp.sendMessage(
-                            TranslatableCaption.of("permission.no_permission_event"),
-                            Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
+                            TranslatableCaption.of("done.building_restricted")
                     );
                     e.setCancelled(true);
                     return;
@@ -1233,8 +1257,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
         } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
                 pp.sendMessage(
-                        TranslatableCaption.of("permission.no_permission_event"),
-                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
+                        TranslatableCaption.of("done.building_restricted")
                 );
                 event.setCancelled(true);
             }
@@ -1307,8 +1330,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
         } else if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
             if (!Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
                 plotPlayer.sendMessage(
-                        TranslatableCaption.of("permission.no_permission_event"),
-                        Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
+                        TranslatableCaption.of("done.building_restricted")
                 );
                 event.setCancelled(true);
             }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java

@@ -27,6 +27,7 @@ package com.plotsquared.bukkit.listener;
 
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.plot.world.SinglePlotArea;
 import com.plotsquared.core.plot.world.SinglePlotAreaManager;
 import com.plotsquared.core.util.ReflectionUtils;
 import org.bukkit.Chunk;
@@ -86,7 +87,7 @@ public class SingleWorldListener implements Listener {
         if (!(man instanceof SinglePlotAreaManager)) {
             return;
         }
-        if (!isPlotId(name)) {
+        if (!SinglePlotArea.isSinglePlotWorld(name)) {
             return;
         }
 
@@ -103,31 +104,4 @@ public class SingleWorldListener implements Listener {
         handle(event);
     }
 
-    private boolean isPlotId(String worldName) {
-        int len = worldName.length();
-        int separator = 0;
-        for (int i = 0; i < len; i++) {
-            switch (worldName.charAt(i)) {
-                case '_':
-                    separator++;
-                    break;
-                case '-':
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                    break;
-                default:
-                    return false;
-            }
-        }
-        return separator == 1;
-    }
-
 }

Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java

@@ -178,8 +178,7 @@ public class BukkitEntityUtil {
                         if (!Permissions
                                 .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
                             plotPlayer.sendMessage(
-                                    TranslatableCaption.of("permission.no_permission_event"),
-                                    Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_OTHER))
+                                    TranslatableCaption.of("done.building_restricted")
                             );
                             return false;
                         }

Bukkit/src/main/resources/plugin.yml

@@ -248,9 +248,12 @@ permissions:
       plots.admin.components.other: true
       plots.admin.vehicle.break.unowned: true
       plots.admin.pve.unowned: true
+      plots.admin.border.bypass: true
 
   plots.teleport.delay.bypass:
     default: op
+  plots.admin.border.bypass:
+    default: op
   plots.worldedit.bypass:
     default: op
   plots.gamemode.bypass:

Core/build.gradle.kts

@@ -5,8 +5,8 @@ dependencies {
     compileOnlyApi(libs.checkerqual)
 
     // Minecraft expectations
-    compileOnlyApi(libs.guava)
     compileOnlyApi(libs.gson)
+    compileOnly(libs.guava)
 
     // Platform expectations
     compileOnlyApi(libs.snakeyaml)
@@ -25,13 +25,13 @@ dependencies {
     compileOnlyApi(libs.findbugs)
 
     // Plugins
-    compileOnlyApi(libs.worldeditCore) {
+    compileOnly(libs.worldeditCore) {
         exclude(group = "bukkit-classloader-check")
         exclude(group = "mockito-core")
         exclude(group = "dummypermscompat")
     }
     testImplementation(libs.worldeditCore)
-    compileOnlyApi(libs.fastasyncworldeditCore) { isTransitive = false }
+    compileOnly(libs.fastasyncworldeditCore) { isTransitive = false }
     testImplementation(libs.fastasyncworldeditCore) { isTransitive = false }
 
     // Logging
@@ -40,7 +40,7 @@ dependencies {
     // Other libraries
     api(libs.prtree)
     api(libs.aopalliance)
-    api(libs.pipeline) {
+    api(libs.rorledning) {
         exclude(group = "com.google.guava")
     }
     api(libs.arkitektonika)

Core/src/main/java/com/plotsquared/core/PlotPlatform.java

@@ -38,6 +38,7 @@ import com.plotsquared.core.inject.annotations.DefaultGenerator;
 import com.plotsquared.core.location.World;
 import com.plotsquared.core.permissions.PermissionHandler;
 import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.queue.GlobalBlockQueue;
 import com.plotsquared.core.util.ChunkManager;
 import com.plotsquared.core.util.EconHandler;
@@ -268,6 +269,13 @@ public interface PlotPlatform<P> extends LocaleHolder {
         return injector().getInstance(ChunkManager.class);
     }
 
+    /**
+     * Get the {@link PlotAreaManager} implementation.
+     *
+     * @return the PlotAreaManager
+     */
+    @NonNull PlotAreaManager plotAreaManager();
+
     /**
      * Get the platform specific console {@link Audience}
      *

Core/src/main/java/com/plotsquared/core/PlotSquared.java

@@ -283,7 +283,7 @@ public class PlotSquared {
      * @return Plot area manager
      */
     public @NonNull PlotAreaManager getPlotAreaManager() {
-        return this.platform.injector().getInstance(PlotAreaManager.class);
+        return this.platform.plotAreaManager();
     }
 
     public void startExpiryTasks() {
@@ -758,6 +758,9 @@ public class PlotSquared {
             if (this_max < last_max) {
                 plot.getArea().setMeta("lastPlot", plot.getId());
             }
+            if (callEvent) {
+                eventDispatcher.callPostDelete(plot);
+            }
             return true;
         }
         return false;

Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java

@@ -193,19 +193,28 @@ public class PlayerBackupProfile implements BackupProfile {
                     future.completeExceptionally(new IllegalArgumentException(
                             "The backup is non-existent or not in the correct format"));
                 } else {
-                    this.schematicHandler.paste(schematic, plot, 0, 1, 0, false, player, new RunnableVal<Boolean>() {
-                        @Override
-                        public void run(Boolean value) {
-                            if (value) {
-                                future.complete(null);
-                            } else {
-                                future.completeExceptionally(new RuntimeException(MINI_MESSAGE.stripTokens(
-                                        TranslatableCaption
-                                                .of("schematics.schematic_paste_failed")
-                                                .getComponent(ConsolePlayer.getConsole()))));
+                    this.schematicHandler.paste(
+                            schematic,
+                            plot,
+                            0,
+                            plot.getArea().getMinBuildHeight(),
+                            0,
+                            false,
+                            player,
+                            new RunnableVal<>() {
+                                @Override
+                                public void run(Boolean value) {
+                                    if (value) {
+                                        future.complete(null);
+                                    } else {
+                                        future.completeExceptionally(new RuntimeException(MINI_MESSAGE.stripTokens(
+                                                TranslatableCaption
+                                                        .of("schematics.schematic_paste_failed")
+                                                        .getComponent(ConsolePlayer.getConsole()))));
+                                    }
+                                }
                             }
-                        }
-                    });
+                    );
                 }
             });
         }

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

@@ -29,6 +29,7 @@ import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.ConfigurationSection;
 import com.plotsquared.core.configuration.ConfigurationUtil;
+import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.CaptionHolder;
 import com.plotsquared.core.configuration.caption.Templates;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
@@ -222,7 +223,7 @@ public class Area extends SubCommand {
                 hybridPlotWorld.setAllowSigns(false);
                 final File parentFile = FileUtils.getFile(
                         PlotSquared.platform().getDirectory(),
-                        "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + hybridPlotWorld.getWorldName() + File.separator
+                        Settings.Paths.SCHEMATICS + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + hybridPlotWorld.getWorldName() + File.separator
                                 + hybridPlotWorld.getId()
                 );
                 if (!parentFile.exists() && !parentFile.mkdirs()) {

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

@@ -344,6 +344,7 @@ public class Auto extends SubCommand {
                     continue;
                 }
                 plot.claim(player, !plotIterator.hasNext(), null, true, true);
+                eventDispatcher.callPostAuto(player, plot);
             }
             final PlotAutoMergeEvent mergeEvent = this.eventDispatcher.callAutoMerge(
                     plots.get(0),

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

@@ -183,10 +183,12 @@ public class Claim extends SubCommand {
                 );
             }
         }
-        int border = area.getBorder();
-        if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border && !force) {
-            player.sendMessage(TranslatableCaption.of("border.border"));
-            return false;
+        if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
+            int border = area.getBorder();
+            if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border && !force) {
+                player.sendMessage(TranslatableCaption.of("border.denied"));
+                return false;
+            }
         }
         plot.setOwnerAbs(player.getUUID());
         final String finalSchematic = schematic;
@@ -206,13 +208,15 @@ public class Claim extends SubCommand {
                                     Template.of("value", "Auto merge on claim")
                             );
                         } else {
-                            plot.getPlotModificationManager().autoMerge(
+                            if (plot.getPlotModificationManager().autoMerge(
                                     mergeEvent.getDir(),
                                     mergeEvent.getMax(),
                                     player.getUUID(),
                                     player,
                                     true
-                            );
+                            )) {
+                                eventDispatcher.callPostMerge(player, plot);
+                            }
                         }
                     }
                     return null;

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

@@ -130,6 +130,7 @@ public class Delete extends SubCommand {
                         Template.of("amount", String.valueOf(System.currentTimeMillis() - start)),
                         Template.of("plot", plot.getId().toString())
                 );
+                eventDispatcher.callPostDelete(plot);
             });
             if (result) {
                 plot.addRunning();

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

@@ -52,7 +52,7 @@ import java.util.concurrent.TimeoutException;
 
 @CommandDeclaration(command = "deny",
         aliases = {"d", "ban"},
-        usage = "/plot deny <player",
+        usage = "/plot deny <player>",
         category = CommandCategory.SETTINGS,
         requiredType = RequiredType.PLAYER)
 public class Deny extends SubCommand {

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

@@ -149,7 +149,7 @@ public class Load extends SubCommand {
                                 0,
                                 false,
                                 player,
-                                new RunnableVal<Boolean>() {
+                                new RunnableVal<>() {
                                     @Override
                                     public void run(Boolean value) {
                                         plot.removeRunning();

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

@@ -274,7 +274,7 @@ public class MainCommand extends Command {
                     }
                     tp = true;
                 } else {
-                    player.sendMessage(TranslatableCaption.of("border.border"));
+                    player.sendMessage(TranslatableCaption.of("border.denied"));
                 }
                 // Trim command
                 args = Arrays.copyOfRange(args, 1, args.length);

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

@@ -189,6 +189,7 @@ public class Merge extends SubCommand {
                     );
                 }
                 player.sendMessage(TranslatableCaption.of("merge.success_merge"));
+                eventDispatcher.callPostMerge(player, plot);
                 return true;
             }
             player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
@@ -225,6 +226,7 @@ public class Merge extends SubCommand {
                 );
             }
             player.sendMessage(TranslatableCaption.of("merge.success_merge"));
+            eventDispatcher.callPostMerge(player, plot);
             return true;
         }
         Plot adjacent = plot.getRelative(direction);
@@ -272,6 +274,7 @@ public class Merge extends SubCommand {
                     );
                 }
                 player.sendMessage(TranslatableCaption.of("merge.success_merge"));
+                eventDispatcher.callPostMerge(player, plot);
             };
             if (!force && hasConfirmation(player)) {
                 CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE

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

@@ -44,6 +44,7 @@ import com.plotsquared.core.util.TabCompletions;
 import com.plotsquared.core.util.task.TaskManager;
 import net.kyori.adventure.text.minimessage.Template;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -76,6 +77,7 @@ public class Owner extends SetCommand {
             );
             return false;
         }
+        @Nullable final UUID oldOwner = plot.getOwnerAbs();
         Set<Plot> plots = plot.getConnectedPlots();
 
         final Consumer<UUID> uuidConsumer = uuid -> {
@@ -124,12 +126,15 @@ public class Owner extends SetCommand {
                     );
                     return;
                 }
-                plot.getPlotModificationManager().unlinkPlot(unlinkEvent.isCreateRoad(), unlinkEvent.isCreateRoad());
+                if (plot.getPlotModificationManager().unlinkPlot(unlinkEvent.isCreateRoad(), unlinkEvent.isCreateRoad())) {
+                    eventDispatcher.callPostUnlink(plot, PlotUnlinkEvent.REASON.NEW_OWNER);
+                }
                 Set<Plot> connected = plot.getConnectedPlots();
                 for (Plot current : connected) {
                     current.unclaim();
                     current.getPlotModificationManager().removeSign();
                 }
+                eventDispatcher.callPostOwnerChange(player, plot, oldOwner);
                 player.sendMessage(TranslatableCaption.of("owner.set_owner"));
                 return;
             }
@@ -178,6 +183,7 @@ public class Owner extends SetCommand {
                         }
                         plot.getPlotModificationManager().setSign(finalName);
                         player.sendMessage(TranslatableCaption.of("owner.set_owner"));
+                        eventDispatcher.callPostOwnerChange(player, plot, oldOwner);
                         if (other != null) {
                             other.sendMessage(
                                     TranslatableCaption.of("owner.now_owner"),

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

@@ -166,7 +166,7 @@ public class SchematicCmd extends SubCommand {
                             0,
                             false,
                             player,
-                            new RunnableVal<Boolean>() {
+                            new RunnableVal<>() {
                                 @Override
                                 public void run(Boolean value) {
                                     SchematicCmd.this.running = false;

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

@@ -109,6 +109,7 @@ public class Unlink extends SubCommand {
                 return;
             }
             player.sendMessage(TranslatableCaption.of("merge.unlink_success"));
+            eventDispatcher.callPostUnlink(plot, PlotUnlinkEvent.REASON.PLAYER_COMMAND);
         };
         if (hasConfirmation(player)) {
             CmdConfirm.addPending(player, "/plot unlink " + plot.getId(), runnable);

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

@@ -140,21 +140,16 @@ public class Visit extends Command {
                 return;
             }
         } else {
-            if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_OTHER)) {
+            // allow visit, if UntrustedVisit flag is set, or if the player has either the plot.visit.other or
+            // plot.admin.visit.untrusted permission
+            if (!plot.getFlag(UntrustedVisitFlag.class) && !Permissions.hasPermission(player, Permission.PERMISSION_VISIT_OTHER)
+                && !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_VISIT_UNTRUSTED)) {
                 player.sendMessage(
                         TranslatableCaption.of("permission.no_permission"),
                         Templates.of("node", "plots.visit.other")
                 );
                 return;
             }
-            if (!plot.getFlag(UntrustedVisitFlag.class) && !Permissions
-                    .hasPermission(player, Permission.PERMISSION_ADMIN_VISIT_UNTRUSTED)) {
-                player.sendMessage(
-                        TranslatableCaption.of("permission.no_permission"),
-                        Templates.of("node", "plots.admin.visit.untrusted")
-                );
-                return;
-            }
             if (plot.isDenied(player.getUUID())) {
                 if (!Permissions.hasPermission(player, Permission.PERMISSION_VISIT_DENIED)) {
                     player.sendMessage(

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -556,8 +556,10 @@ public class Settings extends Config {
         public static boolean ON_DEATH = false;
         @Comment("Teleport to your plot on login")
         public static boolean ON_LOGIN = false;
-        @Comment("Teleport to your plot on claim")
+        @Comment("Teleport to your plot on claim (/plot claim)")
         public static boolean ON_CLAIM = true;
+        @Comment("Teleport to your plot on auto (/plot auto)")
+        public static boolean ON_AUTO = true;
         @Comment({"Add a delay to all teleport commands (in seconds)",
                 "Assign `plots.teleport.delay.bypass` to bypass the cooldown"})
         public static int DELAY = 0;
@@ -708,6 +710,9 @@ public class Settings extends Config {
                 "If you would like to still show the owner of the plot, append the contents of \"titles.title_entered_plot_sub\" onto the " +
                         "former lang key."})
         public static boolean TITLES_AS_ACTIONBAR = false;
+        @Comment({"If the default title should be displayed on plots with server-plot flag set.",
+                "Titles will still be sent if the plot-title flag is set."})
+        public static boolean DISPLAY_DEFAULT_ON_SERVER_PLOT = false;
 
     }
 

Core/src/main/java/com/plotsquared/core/database/SQLManager.java

@@ -2099,6 +2099,7 @@ public class SQLManager implements AbstractDB {
                                 case "default":
                                 case "0,0,0":
                                 case "center":
+                                case "centre":
                                     break;
                                 default:
                                     try {
@@ -2946,6 +2947,7 @@ public class SQLManager implements AbstractDB {
                             case "default":
                             case "0,0,0":
                             case "center":
+                            case "centre":
                                 break;
                             default:
                                 try {

Core/src/main/java/com/plotsquared/core/events/post/PostPlayerAutoPlotEvent.java

@@ -0,0 +1,51 @@
+/*
+ *       _____  _       _    _____                                _
+ *      |  __ \| |     | |  / ____|                              | |
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            PlotSquared plot management system for Minecraft
+ *                  Copyright (C) 2021 IntellectualSites
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.events.post;
+
+import com.plotsquared.core.events.PlotPlayerEvent;
+import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.Plot;
+
+/**
+ * Called after a plot was chosen for a player by {@code /plot auto}
+ * <br>
+ * Called after {@link com.plotsquared.core.events.PlayerAutoPlotEvent} and only, if no listener cancelled the action.
+ *
+ * @since 6.2.0
+ */
+public class PostPlayerAutoPlotEvent extends PlotPlayerEvent {
+
+    /**
+     * Instantiate a new PlayerAutoPlotPostEvent.
+     *
+     * @param plotPlayer The player who claims a new plot by {@code /plot auto}.
+     * @param plot       The plot that is assigned to the player.
+     */
+    public PostPlayerAutoPlotEvent(final PlotPlayer<?> plotPlayer, final Plot plot) {
+        super(plotPlayer, plot);
+    }
+
+}

Core/src/main/java/com/plotsquared/core/events/post/PostPlotChangeOwnerEvent.java

@@ -0,0 +1,80 @@
+/*
+ *       _____  _       _    _____                                _
+ *      |  __ \| |     | |  / ____|                              | |
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            PlotSquared plot management system for Minecraft
+ *                  Copyright (C) 2021 IntellectualSites
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.events.post;
+
+import com.plotsquared.core.events.PlotPlayerEvent;
+import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.Plot;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.UUID;
+
+/**
+ * Called after the owner of a plot was updated.
+ *
+ * @since 6.2.0
+ */
+public class PostPlotChangeOwnerEvent extends PlotPlayerEvent {
+
+    @Nullable
+    private final UUID oldOwner;
+
+    /**
+     * Instantiate a new PlotChangedOwnerEvent.
+     *
+     * @param initiator The player who executed the owner change.
+     * @param plot      The plot which owner was changed.
+     * @param oldOwner  The previous owner - if present, otherwise {@code null}.
+     */
+    public PostPlotChangeOwnerEvent(final PlotPlayer<?> initiator, final Plot plot, @Nullable UUID oldOwner) {
+        super(initiator, plot);
+        this.oldOwner = oldOwner;
+    }
+
+    /**
+     * @return the old owner of the plot - if present, otherwise {@code null}.
+     */
+    public @Nullable UUID getOldOwner() {
+        return oldOwner;
+    }
+
+    /**
+     * @return {@code true} if the plot had an owner, {@code false} otherwise.
+     * @see #getOldOwner()
+     */
+    public boolean hasOldOwner() {
+        return getOldOwner() != null;
+    }
+
+    /**
+     * @return {@code true} if the plot now has an owner, {@code false} otherwise.
+     * @see Plot#hasOwner()
+     */
+    public boolean hasNewOwner() {
+        return getPlot().hasOwner();
+    }
+
+}

Core/src/main/java/com/plotsquared/core/events/post/PostPlotDeleteEvent.java

@@ -0,0 +1,47 @@
+/*
+ *       _____  _       _    _____                                _
+ *      |  __ \| |     | |  / ____|                              | |
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            PlotSquared plot management system for Minecraft
+ *                  Copyright (C) 2021 IntellectualSites
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.events.post;
+
+import com.plotsquared.core.events.PlotEvent;
+import com.plotsquared.core.plot.Plot;
+
+/**
+ * Called after a {@link Plot} was deleted.
+ *
+ * @since 6.2.0
+ */
+public class PostPlotDeleteEvent extends PlotEvent {
+
+    /**
+     * Instantiate a new PlotDeleteEvent.
+     *
+     * @param plot The plot which was deleted.
+     */
+    public PostPlotDeleteEvent(final Plot plot) {
+        super(plot);
+    }
+
+}

Core/src/main/java/com/plotsquared/core/events/post/PostPlotMergeEvent.java

@@ -0,0 +1,49 @@
+/*
+ *       _____  _       _    _____                                _
+ *      |  __ \| |     | |  / ____|                              | |
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            PlotSquared plot management system for Minecraft
+ *                  Copyright (C) 2021 IntellectualSites
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.events.post;
+
+import com.plotsquared.core.events.PlotPlayerEvent;
+import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.Plot;
+
+/**
+ * Called after multiple plots were merged with another.
+ *
+ * @since 6.2.0
+ */
+public class PostPlotMergeEvent extends PlotPlayerEvent {
+
+    /**
+     * Instantiate a new PlotMergedEvent.
+     *
+     * @param plotPlayer The {@link PlotPlayer} that initiated the merge.
+     * @param plot       The final merged plot.
+     */
+    public PostPlotMergeEvent(final PlotPlayer<?> plotPlayer, final Plot plot) {
+        super(plotPlayer, plot);
+    }
+
+}

Core/src/main/java/com/plotsquared/core/events/post/PostPlotUnlinkEvent.java

@@ -0,0 +1,61 @@
+/*
+ *       _____  _       _    _____                                _
+ *      |  __ \| |     | |  / ____|                              | |
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            PlotSquared plot management system for Minecraft
+ *                  Copyright (C) 2021 IntellectualSites
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.events.post;
+
+import com.plotsquared.core.events.PlotEvent;
+import com.plotsquared.core.events.PlotUnlinkEvent;
+import com.plotsquared.core.plot.Plot;
+
+/**
+ * Called when several plots were unlinked.
+ *
+ * @since 6.2.0
+ */
+public class PostPlotUnlinkEvent extends PlotEvent {
+
+    private final PlotUnlinkEvent.REASON reason;
+
+    /**
+     * Instantiate a new PlotUnlinkedEvent.
+     *
+     * @param plot   The unlinked plot.
+     * @param reason The reason for the unlink.
+     */
+    public PostPlotUnlinkEvent(final Plot plot, PlotUnlinkEvent.REASON reason) {
+        super(plot);
+        this.reason = reason;
+    }
+
+    /**
+     * The original reason provided by {@link PlotUnlinkEvent}.
+     *
+     * @return The reason for the unlink.
+     */
+    public PlotUnlinkEvent.REASON getReason() {
+        return reason;
+    }
+
+}

Core/src/main/java/com/plotsquared/core/events/post/package-info.java

@@ -0,0 +1,33 @@
+/*
+ *       _____  _       _    _____                                _
+ *      |  __ \| |     | |  / ____|                              | |
+ *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
+ *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
+ *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
+ *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
+ *                                    | |
+ *                                    |_|
+ *            PlotSquared plot management system for Minecraft
+ *                  Copyright (C) 2021 IntellectualSites
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+/**
+ * Contains events which are fired after specific actions are completed.
+ * <br>
+ * E.g. {@link com.plotsquared.core.events.PlotDeleteEvent} is called <b>before</b> a plot is actually deleted and useful for
+ * cancelling the action itself. {@link com.plotsquared.core.events.post.PostPlotDeleteEvent} will be called after the plot was
+ * deleted.
+ */
+package com.plotsquared.core.events.post;

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

@@ -506,16 +506,32 @@ public class ClassicPlotManager extends SquarePlotManager {
                 Location.at(
                         classicPlotWorld.getWorldName(),
                         sx,
-                        Math.min(classicPlotWorld.WALL_HEIGHT, classicPlotWorld.ROAD_HEIGHT) + 1,
+                        Math.min(
+                                classicPlotWorld.PLOT_HEIGHT,
+                                Math.min(classicPlotWorld.WALL_HEIGHT, classicPlotWorld.ROAD_HEIGHT)
+                        ) + 1,
                         sz + 1
                 ),
                 Location.at(classicPlotWorld.getWorldName(), ex, maxY, ez - 1), BlockTypes.AIR.getDefaultState()
         );
-        queue.setCuboid(
-                Location.at(classicPlotWorld.getWorldName(), sx, 0, sz + 1),
-                Location.at(classicPlotWorld.getWorldName(), ex, 0, ez - 1),
-                BlockUtil.get((short) 7, (byte) 0)
-        );
+        if (classicPlotWorld.PLOT_BEDROCK) {
+            queue.setCuboid(
+                    Location.at(classicPlotWorld.getWorldName(), sx, 0, sz + 1),
+                    Location.at(classicPlotWorld.getWorldName(), ex, 0, ez - 1),
+                    BlockTypes.BEDROCK.getDefaultState()
+            );
+            queue.setCuboid(
+                    Location.at(classicPlotWorld.getWorldName(), sx, 1, sz + 1),
+                    Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.WALL_HEIGHT, ez - 1),
+                    classicPlotWorld.WALL_FILLING.toPattern()
+            );
+        } else {
+            queue.setCuboid(
+                    Location.at(classicPlotWorld.getWorldName(), sx, 0, sz + 1),
+                    Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.WALL_HEIGHT, ez - 1),
+                    classicPlotWorld.WALL_FILLING.toPattern()
+            );
+        }
         queue.setCuboid(
                 Location.at(classicPlotWorld.getWorldName(), sx, 1, sz + 1),
                 Location.at(classicPlotWorld.getWorldName(), sx, classicPlotWorld.WALL_HEIGHT, ez - 1),
@@ -568,7 +584,10 @@ public class ClassicPlotManager extends SquarePlotManager {
                 Location.at(
                         classicPlotWorld.getWorldName(),
                         sx + 1,
-                        Math.min(classicPlotWorld.WALL_HEIGHT, classicPlotWorld.ROAD_HEIGHT) + 1,
+                        Math.min(
+                                classicPlotWorld.PLOT_HEIGHT,
+                                Math.min(classicPlotWorld.WALL_HEIGHT, classicPlotWorld.ROAD_HEIGHT)
+                        ) + 1,
                         sz
                 ),
                 Location.at(classicPlotWorld.getWorldName(), ex - 1, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
@@ -663,7 +682,10 @@ public class ClassicPlotManager extends SquarePlotManager {
                         Location.at(
                                 classicPlotWorld.getWorldName(),
                                 sx,
-                                Math.min(classicPlotWorld.PLOT_HEIGHT, classicPlotWorld.ROAD_HEIGHT) + 1,
+                                Math.min(
+                                        classicPlotWorld.PLOT_HEIGHT,
+                                        Math.min(classicPlotWorld.WALL_HEIGHT, classicPlotWorld.ROAD_HEIGHT)
+                                ) + 1,
                                 sz
                         ),
                         Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
@@ -703,7 +725,10 @@ public class ClassicPlotManager extends SquarePlotManager {
                         Location.at(
                                 classicPlotWorld.getWorldName(),
                                 sx,
-                                Math.min(classicPlotWorld.PLOT_HEIGHT, classicPlotWorld.ROAD_HEIGHT) + 1,
+                                Math.min(
+                                        classicPlotWorld.PLOT_HEIGHT,
+                                        Math.min(classicPlotWorld.WALL_HEIGHT, classicPlotWorld.ROAD_HEIGHT)
+                                ) + 1,
                                 sz
                         ),
                         Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
@@ -742,7 +767,10 @@ public class ClassicPlotManager extends SquarePlotManager {
                         Location.at(
                                 classicPlotWorld.getWorldName(),
                                 sx,
-                                Math.min(classicPlotWorld.PLOT_HEIGHT, classicPlotWorld.ROAD_HEIGHT) + 1,
+                                Math.min(
+                                        classicPlotWorld.PLOT_HEIGHT,
+                                        Math.min(classicPlotWorld.WALL_HEIGHT, classicPlotWorld.ROAD_HEIGHT)
+                                ) + 1,
                                 sz
                         ),
                         Location.at(classicPlotWorld.getWorldName(), ex, classicPlotWorld.getPlotManager().getWorldHeight(), ez),

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

@@ -63,7 +63,7 @@ public class HybridGen extends IndependentPlotGenerator {
                 && Settings.Schematics.PASTE_ON_TOP)) {
             minY = world.SCHEM_Y;
         } else {
-            minY = 1;
+            minY = world.getMinBuildHeight();
         }
         BaseBlock[] blocks = world.G_SCH.get(MathMan.pair(relativeX, relativeZ));
         if (blocks != null) {
@@ -156,11 +156,12 @@ public class HybridGen extends IndependentPlotGenerator {
             }
         }
         // generation
+        int startY = hybridPlotWorld.PLOT_BEDROCK ? 1 : 0;
         for (short x = 0; x < 16; x++) {
             if (insideRoadX[x]) {
                 for (short z = 0; z < 16; z++) {
                     // Road
-                    for (int y = 1; y <= hybridPlotWorld.ROAD_HEIGHT; y++) {
+                    for (int y = startY; y <= hybridPlotWorld.ROAD_HEIGHT; y++) {
                         result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
                     }
                     if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
@@ -171,7 +172,7 @@ public class HybridGen extends IndependentPlotGenerator {
                 for (short z = 0; z < 16; z++) {
                     if (insideRoadZ[z]) {
                         // road
-                        for (int y = 1; y <= hybridPlotWorld.ROAD_HEIGHT; y++) {
+                        for (int y = startY; y <= hybridPlotWorld.ROAD_HEIGHT; y++) {
                             result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
                         }
                         if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
@@ -181,7 +182,7 @@ public class HybridGen extends IndependentPlotGenerator {
                         }
                     } else {
                         // wall
-                        for (int y = 1; y <= hybridPlotWorld.WALL_HEIGHT; y++) {
+                        for (int y = startY; y <= hybridPlotWorld.WALL_HEIGHT; y++) {
                             result.setBlock(x, y, z, hybridPlotWorld.WALL_FILLING.toPattern());
                         }
                         if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
@@ -201,7 +202,7 @@ public class HybridGen extends IndependentPlotGenerator {
                 for (short z = 0; z < 16; z++) {
                     if (insideRoadZ[z]) {
                         // road
-                        for (int y = 1; y <= hybridPlotWorld.ROAD_HEIGHT; y++) {
+                        for (int y = startY; y <= hybridPlotWorld.ROAD_HEIGHT; y++) {
                             result.setBlock(x, y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
                         }
                         if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
@@ -211,7 +212,7 @@ public class HybridGen extends IndependentPlotGenerator {
                         }
                     } else if (insideWallZ[z]) {
                         // wall
-                        for (int y = 1; y <= hybridPlotWorld.WALL_HEIGHT; y++) {
+                        for (int y = startY; y <= hybridPlotWorld.WALL_HEIGHT; y++) {
                             result.setBlock(x, y, z, hybridPlotWorld.WALL_FILLING.toPattern());
                         }
                         if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
@@ -227,7 +228,7 @@ public class HybridGen extends IndependentPlotGenerator {
                         }
                     } else {
                         // plot
-                        for (int y = 1; y < hybridPlotWorld.PLOT_HEIGHT; y++) {
+                        for (int y = startY; y < hybridPlotWorld.PLOT_HEIGHT; y++) {
                             result.setBlock(x, y, z, hybridPlotWorld.MAIN_BLOCK.toPattern());
                         }
                         result.setBlock(x, hybridPlotWorld.PLOT_HEIGHT, z,

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

@@ -82,10 +82,12 @@ public class HybridPlotManager extends ClassicPlotManager {
                 Settings.Paths.TEMPLATES + "/tmp-data.yml",
                 Template.getBytes(hybridPlotWorld)
         ));
-        String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + hybridPlotWorld.getWorldName() + File.separator;
+        String dir =
+                Settings.Paths.SCHEMATICS + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + hybridPlotWorld.getWorldName() + File.separator;
         try {
             File sideRoad = FileUtils.getFile(PlotSquared.platform().getDirectory(), dir + "sideroad.schem");
-            String newDir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__" + File.separator;
+            String newDir =
+                    Settings.Paths.SCHEMATICS + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__" + File.separator;
             if (sideRoad.exists()) {
                 files.add(new FileBytes(newDir + "sideroad.schem", Files.readAllBytes(sideRoad.toPath())));
             }
@@ -152,7 +154,7 @@ public class HybridPlotManager extends ClassicPlotManager {
         if ((isRoad && Settings.Schematics.PASTE_ROAD_ON_TOP) || (!isRoad && Settings.Schematics.PASTE_ON_TOP)) {
             minY = hybridPlotWorld.SCHEM_Y;
         } else {
-            minY = 1;
+            minY = hybridPlotWorld.getMinBuildHeight();
         }
         BaseBlock airBlock = BlockTypes.AIR.getDefaultState().toBaseBlock();
         for (int x = pos1.getX(); x <= pos2.getX(); x++) {
@@ -249,12 +251,11 @@ public class HybridPlotManager extends ClassicPlotManager {
         final Pattern plotfloor = hybridPlotWorld.TOP_BLOCK.toPattern();
         final Pattern filling = hybridPlotWorld.MAIN_BLOCK.toPattern();
 
-        final BlockState bedrock;
-        final BlockState air = BlockTypes.AIR.getDefaultState();
+        final Pattern bedrock;
         if (hybridPlotWorld.PLOT_BEDROCK) {
             bedrock = BlockTypes.BEDROCK.getDefaultState();
         } else {
-            bedrock = air;
+            bedrock = hybridPlotWorld.MAIN_BLOCK.toPattern();
         }
 
         final BiomeType biome = hybridPlotWorld.getPlotBiome();
@@ -274,7 +275,7 @@ public class HybridPlotManager extends ClassicPlotManager {
             // Each component has a different layer
             queue.setCuboid(pos1.withY(1), pos2.withY(hybridPlotWorld.PLOT_HEIGHT - 1), filling);
             queue.setCuboid(pos1.withY(hybridPlotWorld.PLOT_HEIGHT), pos2.withY(hybridPlotWorld.PLOT_HEIGHT), plotfloor);
-            queue.setCuboid(pos1.withY(hybridPlotWorld.PLOT_HEIGHT + 1), pos2.withY(getWorldHeight()), air);
+            queue.setCuboid(pos1.withY(hybridPlotWorld.PLOT_HEIGHT + 1), pos2.withY(getWorldHeight()), BlockTypes.AIR.getDefaultState());
             queue.setBiomeCuboid(pos1, pos2, biome);
         } else {
             queue.setRegenRegion(new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()));

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

@@ -253,22 +253,32 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         int shift = this.ROAD_WIDTH / 2;
         int oddshift = (this.ROAD_WIDTH & 1) == 0 ? 0 : 1;
 
-        SCHEM_Y = Math.min(PLOT_HEIGHT, ROAD_HEIGHT);
+        SCHEM_Y = Math.min(PLOT_HEIGHT, Math.min(WALL_HEIGHT, ROAD_HEIGHT));
         int plotY = PLOT_HEIGHT - SCHEM_Y;
-        int roadY = ROAD_HEIGHT - SCHEM_Y;
+        int roadY = Math.min(ROAD_HEIGHT, WALL_HEIGHT) - SCHEM_Y;
 
-        if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() == 256) {
-            SCHEM_Y = 0;
-            plotY = 0;
-            roadY = ROAD_HEIGHT;
+        if (schematic3 != null) {
+            if (schematic3.getClipboard().getDimensions().getY() == 256) {
+                SCHEM_Y = plotY = 0;
+            } else if (!Settings.Schematics.PASTE_ON_TOP) {
+                SCHEM_Y = plotY = getMinBuildHeight();
+            }
         }
 
-        if (schematic1 != null && schematic1.getClipboard().getDimensions().getY() == 256) {
-            SCHEM_Y = 0;
-            if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != 256) {
-                plotY = PLOT_HEIGHT;
+        if (schematic1 != null) {
+            if (schematic1.getClipboard().getDimensions().getY() == 256) {
+                SCHEM_Y = roadY = 0;
+                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != 256
+                        && !Settings.Schematics.PASTE_ON_TOP) {
+                    plotY = PLOT_HEIGHT;
+                }
+            } else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) {
+                SCHEM_Y = roadY = getMinBuildHeight();
+                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != 256
+                        && !Settings.Schematics.PASTE_ON_TOP) {
+                    plotY = PLOT_HEIGHT;
+                }
             }
-            roadY = 0;
         }
 
         if (schematic3 != null) {
@@ -324,7 +334,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                 LOGGER.info("- plot schematic: {}", schematic3File.getPath());
             }
         }
-        if (schematic1 == null || schematic2 == null || this.ROAD_WIDTH == 0) {
+        if ((schematic1 == null&& schematic2 == null) || this.ROAD_WIDTH == 0) {
             if (Settings.DEBUG) {
                 LOGGER.info("- schematic: false");
             }

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

@@ -504,9 +504,10 @@ public class HybridUtils {
         Location top = plot.getTopAbs();
         final HybridPlotWorld plotworld = (HybridPlotWorld) plot.getArea();
         PlotManager plotManager = plotworld.getPlotManager();
+        int schemY = Math.min(plotworld.PLOT_HEIGHT, Math.min(plotworld.WALL_HEIGHT, plotworld.ROAD_HEIGHT));
         int sx = bot.getX() - plotworld.ROAD_WIDTH + 1;
         int sz = bot.getZ() + 1;
-        int sy = Settings.Schematics.PASTE_ROAD_ON_TOP ? plotworld.ROAD_HEIGHT : 1;
+        int sy = Settings.Schematics.PASTE_ROAD_ON_TOP ? schemY : plot.getArea().getMinBuildHeight();
         int ex = bot.getX();
         int ez = top.getZ();
         int ey = get_ey(plotManager, queue, sx, ex, sz, ez, sy);
@@ -517,7 +518,7 @@ public class HybridUtils {
         final Set<CuboidRegion> sideRoad = Collections.singleton(RegionUtil.createRegion(sx, ex, sy, ey, sz, ez));
         final Set<CuboidRegion> intersection = Collections.singleton(RegionUtil.createRegion(sx, ex, sy, ty, bz, tz));
 
-        final String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot
+        final String dir = Settings.Paths.SCHEMATICS + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot
                 .getArea()
                 .toString() + File.separator;
 

Core/src/main/java/com/plotsquared/core/listener/PlotListener.java

@@ -58,6 +58,7 @@ import com.plotsquared.core.plot.flag.implementations.MusicFlag;
 import com.plotsquared.core.plot.flag.implementations.NotifyEnterFlag;
 import com.plotsquared.core.plot.flag.implementations.NotifyLeaveFlag;
 import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
+import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
 import com.plotsquared.core.plot.flag.implementations.TimeFlag;
 import com.plotsquared.core.plot.flag.implementations.TitlesFlag;
 import com.plotsquared.core.plot.flag.implementations.WeatherFlag;
@@ -317,51 +318,52 @@ public class PlotListener {
                     subtitle = "";
                     fromFlag = false;
                 }
-                // It's not actually possible for these to be null, but IntelliJ is dumb
-                TaskManager.runTaskLaterAsync(() -> {
-                    Plot lastPlot;
-                    try (final MetaDataAccess<Plot> lastPlotAccess =
-                                 player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
-                        lastPlot = lastPlotAccess.get().orElse(null);
-                    }
-                    if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
-                        final UUID plotOwner = plot.getOwnerAbs();
-                        String owner = PlayerManager.getName(plotOwner, false);
-                        Caption header = fromFlag ? StaticCaption.of(title) : TranslatableCaption.of("titles" +
-                                ".title_entered_plot");
-                        Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
-                                ".title_entered_plot_sub");
-                        Template plotTemplate = Template.of("plot", lastPlot.getId().toString());
-                        Template worldTemplate = Template.of("world", player.getLocation().getWorldName());
-                        Template ownerTemplate = Template.of("owner", owner);
-                        Template aliasTemplate = Template.of("alias", plot.getAlias());
-
-                        final Consumer<String> userConsumer = user -> {
-                            if (Settings.Titles.TITLES_AS_ACTIONBAR) {
-                                player.sendActionBar(header, aliasTemplate, plotTemplate, worldTemplate, ownerTemplate);
-                            } else {
-                                player.sendTitle(header, subHeader, aliasTemplate, plotTemplate, worldTemplate, ownerTemplate);
-                            }
-                        };
-
-                        UUID uuid = plot.getOwner();
-                        if (uuid == null) {
-                            userConsumer.accept("Unknown");
-                        } else if (uuid.equals(DBFunc.SERVER)) {
-                            userConsumer.accept(MINI_MESSAGE.stripTokens(TranslatableCaption
-                                    .of("info.server")
-                                    .getComponent(player)));
-                        } else {
-                            PlotSquared.get().getImpromptuUUIDPipeline().getSingle(plot.getOwner(), (user, throwable) -> {
-                                if (throwable != null) {
-                                    userConsumer.accept("Unknown");
-                                } else {
-                                    userConsumer.accept(user);
-                                }
-                            });
+                if (fromFlag || !plot.getFlag(ServerPlotFlag.class) || Settings.Titles.DISPLAY_DEFAULT_ON_SERVER_PLOT) {
+                    TaskManager.runTaskLaterAsync(() -> {
+                        Plot lastPlot;
+                        try (final MetaDataAccess<Plot> lastPlotAccess =
+                                     player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
+                            lastPlot = lastPlotAccess.get().orElse(null);
                         }
-                    }
-                }, TaskTime.seconds(1L));
+                        if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
+                            final UUID plotOwner = plot.getOwnerAbs();
+                            String owner = PlayerManager.getName(plotOwner, false);
+                            Caption header = fromFlag ? StaticCaption.of(title) : TranslatableCaption.of("titles" +
+                                    ".title_entered_plot");
+                            Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
+                                    ".title_entered_plot_sub");
+                            Template plotTemplate = Template.of("plot", lastPlot.getId().toString());
+                            Template worldTemplate = Template.of("world", player.getLocation().getWorldName());
+                            Template ownerTemplate = Template.of("owner", owner);
+                            Template aliasTemplate = Template.of("alias", plot.getAlias());
+
+                            final Consumer<String> userConsumer = user -> {
+                                if (Settings.Titles.TITLES_AS_ACTIONBAR) {
+                                    player.sendActionBar(header, aliasTemplate, plotTemplate, worldTemplate, ownerTemplate);
+                                } else {
+                                    player.sendTitle(header, subHeader, aliasTemplate, plotTemplate, worldTemplate, ownerTemplate);
+                                }
+                            };
+
+                            UUID uuid = plot.getOwner();
+                            if (uuid == null) {
+                                userConsumer.accept("Unknown");
+                            } else if (uuid.equals(DBFunc.SERVER)) {
+                                userConsumer.accept(MINI_MESSAGE.stripTokens(TranslatableCaption
+                                        .of("info.server")
+                                        .getComponent(player)));
+                            } else {
+                                PlotSquared.get().getImpromptuUUIDPipeline().getSingle(plot.getOwner(), (user, throwable) -> {
+                                    if (throwable != null) {
+                                        userConsumer.accept("Unknown");
+                                    } else {
+                                        userConsumer.accept(user);
+                                    }
+                                });
+                            }
+                        }
+                    }, TaskTime.seconds(1L));
+                }
             }
 
             TimedFlag.Timed<Integer> feed = plot.getFlag(FeedFlag.class);

Core/src/main/java/com/plotsquared/core/location/BlockLoc.java

@@ -25,8 +25,14 @@
  */
 package com.plotsquared.core.location;
 
+import com.plotsquared.core.util.StringMan;
+
 public class BlockLoc {
 
+    public static final BlockLoc ZERO = new BlockLoc(0, 0, 0);
+    public static final BlockLoc MINY = new BlockLoc(0, Integer.MIN_VALUE, 0);
+    private static final BlockLoc MIDDLE = new BlockLoc(Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE);
+
     private final int x;
     private final int y;
     private final int z;
@@ -34,6 +40,10 @@ public class BlockLoc {
     private final float yaw;
     private final float pitch;
 
+    public BlockLoc(int x, int y, int z) {
+        this(x, y, z, 0f, 0f);
+    }
+
     public BlockLoc(int x, int y, int z, float yaw, float pitch) {
         this.x = x;
         this.y = y;
@@ -43,26 +53,31 @@ public class BlockLoc {
         this.pitch = pitch;
     }
 
-    public BlockLoc(int x, int y, int z) {
-        this(x, y, z, 0f, 0f);
-    }
-
     public static BlockLoc fromString(String string) {
-        String[] parts = string.split(",");
-
-        float yaw;
-        float pitch;
-        if (parts.length == 5) {
-            yaw = Float.parseFloat(parts[3]);
-            pitch = Float.parseFloat(parts[4]);
+        if (string == null || "side".equalsIgnoreCase(string)) {
+            return null;
+        } else if (StringMan.isEqualIgnoreCaseToAny(string, "center", "middle", "centre")) {
+            return MIDDLE;
         } else {
-            return new BlockLoc(0, 0, 0);
-        }
-        int x = Integer.parseInt(parts[0]);
-        int y = Integer.parseInt(parts[1]);
-        int z = Integer.parseInt(parts[2]);
+            String[] parts = string.split(",");
 
-        return new BlockLoc(x, y, z, yaw, pitch);
+            float yaw;
+            float pitch;
+            if (parts.length == 5) {
+                yaw = Float.parseFloat(parts[3]);
+                pitch = Float.parseFloat(parts[4]);
+            } else if (parts.length == 3) {
+                yaw = 0;
+                pitch = 0;
+            } else {
+                return ZERO;
+            }
+            int x = Integer.parseInt(parts[0]);
+            int y = Integer.parseInt(parts[1]);
+            int z = Integer.parseInt(parts[2]);
+
+            return new BlockLoc(x, y, z, yaw, pitch);
+        }
     }
 
     @Override
@@ -88,12 +103,12 @@ public class BlockLoc {
         }
         BlockLoc other = (BlockLoc) obj;
         return this.getX() == other.getX() && this.getY() == other.getY() && this.getZ() == other
-                .getZ();
+                .getZ() && this.getYaw() == other.getYaw() && this.getPitch() == other.getPitch();
     }
 
     @Override
     public String toString() {
-        if (this.getX() == 0 && this.getY() == 0 && this.getZ() == 0) {
+        if (this.getX() == 0 && this.getY() == 0 && this.getZ() == 0 && this.getYaw() == 0 && this.getPitch() == 0) {
             return "";
         }
         return this.getX() + "," + this.getY() + ',' + this.getZ() + ',' + this.getYaw() + ','

Core/src/main/java/com/plotsquared/core/location/PlotLoc.java

@@ -56,7 +56,7 @@ public final class PlotLoc {
     public static @Nullable PlotLoc fromString(final String input) {
         if (input == null || "side".equalsIgnoreCase(input)) {
             return null;
-        } else if (StringMan.isEqualIgnoreCaseToAny(input, "center", "middle")) {
+        } else if (StringMan.isEqualIgnoreCaseToAny(input, "center", "middle", "centre")) {
             return new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
         } else {
             try {

Core/src/main/java/com/plotsquared/core/permissions/Permission.java

@@ -204,7 +204,8 @@ public enum Permission {
     PERMISSION_ADMIN_DEBUG_OTHER("plots.admin.debug.other"),
     PERMISSION_RATE("plots.rate"),
     PERMISSION_ADMIN_FLIGHT("plots.admin.flight"),
-    PERMISSION_ADMIN_COMPONENTS_OTHER("plots.admin.component.other");
+    PERMISSION_ADMIN_COMPONENTS_OTHER("plots.admin.component.other"),
+    PERMISSION_ADMIN_BYPASS_BORDER("plots.admin.border.bypass");
     //</editor-fold>
 
     private final String text;

Core/src/main/java/com/plotsquared/core/plot/Plot.java

@@ -39,12 +39,12 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.events.TeleportCause;
+import com.plotsquared.core.generator.ClassicPlotWorld;
 import com.plotsquared.core.generator.HybridPlotWorld;
 import com.plotsquared.core.listener.PlotListener;
 import com.plotsquared.core.location.BlockLoc;
 import com.plotsquared.core.location.Direction;
 import com.plotsquared.core.location.Location;
-import com.plotsquared.core.location.PlotLoc;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
@@ -1329,7 +1329,7 @@ public class Plot {
             return Location.at(
                     "",
                     0,
-                    this.getArea() instanceof HybridPlotWorld ? ((HybridPlotWorld) this.getArea()).PLOT_HEIGHT + 1 : 4,
+                    this.getArea() instanceof ClassicPlotWorld ? ((ClassicPlotWorld) this.getArea()).PLOT_HEIGHT + 1 : 4,
                     0
             );
         }
@@ -1404,7 +1404,7 @@ public class Plot {
                 return Location.at(
                         "",
                         0,
-                        this.getArea() instanceof HybridPlotWorld ? ((HybridPlotWorld) this.getArea()).PLOT_HEIGHT + 1 : 4,
+                        this.getArea() instanceof ClassicPlotWorld ? ((ClassicPlotWorld) this.getArea()).PLOT_HEIGHT + 1 : 4,
                         0
                 );
             }
@@ -1443,7 +1443,7 @@ public class Plot {
                 result.accept(Location.at(
                         "",
                         0,
-                        this.getArea() instanceof HybridPlotWorld ? ((HybridPlotWorld) this.getArea()).PLOT_HEIGHT + 1 : 4,
+                        this.getArea() instanceof ClassicPlotWorld ? ((ClassicPlotWorld) this.getArea()).PLOT_HEIGHT + 1 : 4,
                         0
                 ));
                 return;
@@ -1477,7 +1477,7 @@ public class Plot {
      */
     public void setHome(BlockLoc location) {
         Plot plot = this.getBasePlot(false);
-        if (location != null && new BlockLoc(0, 0, 0).equals(location)) {
+        if (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location)) {
             return;
         }
         plot.getSettings().setPosition(location);
@@ -1506,7 +1506,7 @@ public class Plot {
     @Deprecated
     public Location getDefaultHomeSynchronous(final boolean member) {
         Plot plot = this.getBasePlot(false);
-        PlotLoc loc = member ? area.getDefaultHome() : area.getNonmemberHome();
+        BlockLoc loc = member ? area.defaultHome() : area.nonmemberHome();
         if (loc != null) {
             int x;
             int z;
@@ -1525,10 +1525,10 @@ public class Plot {
                 x = bot.getX() + loc.getX();
                 z = bot.getZ() + loc.getZ();
             }
-            int y = loc.getY() < 1
+            int y = loc.getY() == Integer.MIN_VALUE
                     ? (isLoaded() ? this.worldUtil.getHighestBlockSynchronous(plot.getWorldName(), x, z) + 1 : 63)
                     : loc.getY();
-            return Location.at(plot.getWorldName(), x, y, z);
+            return Location.at(plot.getWorldName(), x, y, z, loc.getYaw(), loc.getPitch());
         }
         // Side
         return plot.getSideSynchronous();
@@ -1540,12 +1540,12 @@ public class Plot {
             result.accept(Location.at(
                     "",
                     0,
-                    this.getArea() instanceof HybridPlotWorld ? ((HybridPlotWorld) this.getArea()).PLOT_HEIGHT + 1 : 4,
+                    this.getArea() instanceof ClassicPlotWorld ? ((ClassicPlotWorld) this.getArea()).PLOT_HEIGHT + 1 : 4,
                     0
             ));
             return;
         }
-        PlotLoc loc = member ? area.getDefaultHome() : area.getNonmemberHome();
+        BlockLoc loc = member ? area.defaultHome() : area.nonmemberHome();
         if (loc != null) {
             int x;
             int z;
@@ -1564,7 +1564,7 @@ public class Plot {
                 x = bot.getX() + loc.getX();
                 z = bot.getZ() + loc.getZ();
             }
-            if (loc.getY() < 1) {
+            if (loc.getY()  == Integer.MIN_VALUE) {
                 if (isLoaded()) {
                     this.worldUtil.getHighestBlock(
                             plot.getWorldName(),
@@ -1573,10 +1573,11 @@ public class Plot {
                             y -> result.accept(Location.at(plot.getWorldName(), x, y + 1, z))
                     );
                 } else {
-                    result.accept(Location.at(plot.getWorldName(), x, 63, z));
+                    int y = this.getArea() instanceof ClassicPlotWorld ? ((ClassicPlotWorld) this.getArea()).PLOT_HEIGHT + 1 : 63;
+                    result.accept(Location.at(plot.getWorldName(), x, y, z, loc.getYaw(), loc.getPitch()));
                 }
             } else {
-                result.accept(Location.at(plot.getWorldName(), x, loc.getY(), z));
+                result.accept(Location.at(plot.getWorldName(), x, loc.getY(), z, loc.getYaw(), loc.getPitch()));
             }
             return;
         }
@@ -1707,9 +1708,14 @@ public class Plot {
         }
         this.getPlotModificationManager().setSign(player.getName());
         player.sendMessage(TranslatableCaption.of("working.claimed"), Template.of("plot", this.getId().toString()));
-        if (teleport && Settings.Teleport.ON_CLAIM) {
-            teleportPlayer(player, auto ? TeleportCause.COMMAND_AUTO : TeleportCause.COMMAND_CLAIM, result -> {
-            });
+        if (teleport) {
+            if (!auto && Settings.Teleport.ON_CLAIM) {
+                teleportPlayer(player, TeleportCause.COMMAND_CLAIM, result -> {
+                });
+            } else if (auto && Settings.Teleport.ON_AUTO) {
+                teleportPlayer(player, TeleportCause.COMMAND_AUTO, result -> {
+                });
+            }
         }
         PlotArea plotworld = getArea();
         if (plotworld.isSchematicOnClaim()) {
@@ -1727,16 +1733,25 @@ public class Plot {
                 e.printStackTrace();
                 return true;
             }
-            schematicHandler.paste(sch, this, 0, 1, 0, Settings.Schematics.PASTE_ON_TOP, player, new RunnableVal<>() {
-                @Override
-                public void run(Boolean value) {
-                    if (value) {
-                        player.sendMessage(TranslatableCaption.of("schematics.schematic_paste_success"));
-                    } else {
-                        player.sendMessage(TranslatableCaption.of("schematics.schematic_paste_failed"));
+            schematicHandler.paste(
+                    sch,
+                    this,
+                    0,
+                    getArea().getMinBuildHeight(),
+                    0,
+                    Settings.Schematics.PASTE_ON_TOP,
+                    player,
+                    new RunnableVal<>() {
+                        @Override
+                        public void run(Boolean value) {
+                            if (value) {
+                                player.sendMessage(TranslatableCaption.of("schematics.schematic_paste_success"));
+                            } else {
+                                player.sendMessage(TranslatableCaption.of("schematics.schematic_paste_failed"));
+                            }
+                        }
                     }
-                }
-            });
+            );
         }
         plotworld.getPlotManager().claimPlot(this, null);
         return true;
@@ -2148,8 +2163,9 @@ public class Plot {
     }
 
     /**
-     * Gets the set home location or 0,0,0 if no location is set<br>
+     * Gets the set home location or 0,Integer#MIN_VALUE,0 if no location is set<br>
      * - Does not take the default home location into account
+     * - PlotSquared will internally find the correct place to teleport to if y = Integer#MIN_VALUE when teleporting to the plot.
      *
      * @return home location
      */

Core/src/main/java/com/plotsquared/core/plot/PlotArea.java

@@ -41,6 +41,7 @@ import com.plotsquared.core.configuration.file.YamlConfiguration;
 import com.plotsquared.core.generator.GridPlotWorld;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.inject.annotations.WorldConfig;
+import com.plotsquared.core.location.BlockLoc;
 import com.plotsquared.core.location.Direction;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.location.PlotLoc;
@@ -123,6 +124,7 @@ public abstract class PlotArea {
             new FlagContainer(GlobalFlagContainer.getInstance());
     private final YamlConfiguration worldConfiguration;
     private final GlobalBlockQueue globalBlockQueue;
+    private final boolean roadFlags = false;
     private boolean autoMerge = false;
     private boolean allowSigns = true;
     private boolean miscSpawnUnowned = false;
@@ -140,14 +142,13 @@ public abstract class PlotArea {
     private PlotAreaType type = PlotAreaType.NORMAL;
     private PlotAreaTerrainType terrain = PlotAreaTerrainType.NONE;
     private boolean homeAllowNonmember = false;
-    private PlotLoc nonmemberHome;
-    private PlotLoc defaultHome;
+    private BlockLoc nonmemberHome;
+    private BlockLoc defaultHome;
     private int maxBuildHeight = 256;
     private int minBuildHeight = 1;
     private GameMode gameMode = GameModes.CREATIVE;
     private Map<String, PlotExpression> prices = new HashMap<>();
     private List<String> schematics = new ArrayList<>();
-    private final boolean roadFlags = false;
     private boolean worldBorder = false;
     private boolean useEconomy = false;
     private int hash;
@@ -370,24 +371,24 @@ public abstract class PlotArea {
 
         String homeNonMembers = config.getString("home.nonmembers");
         String homeDefault = config.getString("home.default");
-        this.defaultHome = PlotLoc.fromString(homeDefault);
+        this.defaultHome = BlockLoc.fromString(homeDefault);
         this.homeAllowNonmember = homeNonMembers.equalsIgnoreCase(homeDefault);
         if (this.homeAllowNonmember) {
             this.nonmemberHome = defaultHome;
         } else {
-            this.nonmemberHome = PlotLoc.fromString(homeNonMembers);
+            this.nonmemberHome = BlockLoc.fromString(homeNonMembers);
         }
 
         if ("side".equalsIgnoreCase(homeDefault)) {
             this.defaultHome = null;
-        } else if (StringMan.isEqualIgnoreCaseToAny(homeDefault, "center", "middle")) {
-            this.defaultHome = new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
+        } else if (StringMan.isEqualIgnoreCaseToAny(homeDefault, "center", "middle", "centre")) {
+            this.defaultHome = new BlockLoc(Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE);
         } else {
             try {
                 /*String[] split = homeDefault.split(",");
                 this.DEFAULT_HOME =
                     new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]));*/
-                this.defaultHome = PlotLoc.fromString(homeDefault);
+                this.defaultHome = BlockLoc.fromString(homeDefault);
             } catch (NumberFormatException ignored) {
                 this.defaultHome = null;
             }
@@ -1351,15 +1352,38 @@ public abstract class PlotArea {
         return this.homeAllowNonmember;
     }
 
-    public PlotLoc getNonmemberHome() {
+    /**
+     * Get the location for non-members to be teleported to.
+     */
+    public BlockLoc nonmemberHome() {
         return this.nonmemberHome;
     }
 
-    public PlotLoc getDefaultHome() {
+    /**
+     * Get the default location for players to be teleported to. May be overriden by {@link #nonmemberHome} if the player is
+     * not a member of the plot.
+     */
+    public BlockLoc defaultHome() {
         return this.defaultHome;
     }
 
-    protected void setDefaultHome(PlotLoc defaultHome) {
+    /**
+     * @deprecated Use {@link #nonmemberHome}
+     */
+    @Deprecated(forRemoval = true)
+    public PlotLoc getNonmemberHome() {
+        return new PlotLoc(this.defaultHome.getX(), this.defaultHome.getY(), this.defaultHome.getZ());
+    }
+
+    /**
+     * @deprecated Use {@link #defaultHome}
+     */
+    @Deprecated(forRemoval = true)
+    public PlotLoc getDefaultHome() {
+        return new PlotLoc(this.defaultHome.getX(), this.defaultHome.getY(), this.defaultHome.getZ());
+    }
+
+    protected void setDefaultHome(BlockLoc defaultHome) {
         this.defaultHome = defaultHome;
     }
 

Core/src/main/java/com/plotsquared/core/plot/PlotId.java

@@ -302,7 +302,7 @@ public final class PlotId {
             // first increase y, then x
             if (this.y == this.end.getY()) {
                 this.x++;
-                this.y = 0;
+                this.y = this.start.getY();
             } else {
                 this.y++;
             }

Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java

@@ -229,8 +229,8 @@ public final class PlotModificationManager {
                         !isDelete,
                         isDelete ? PlotUnlinkEvent.REASON.DELETE : PlotUnlinkEvent.REASON.CLEAR
                 );
-        if (event.getEventResult() != Result.DENY) {
-            this.unlinkPlot(event.isCreateRoad(), event.isCreateSign());
+        if (event.getEventResult() != Result.DENY && this.unlinkPlot(event.isCreateRoad(), event.isCreateSign())) {
+            PlotSquared.get().getEventDispatcher().callPostUnlink(plot, event.getReason());
         }
         final PlotManager manager = this.plot.getArea().getPlotManager();
         Runnable run = new Runnable() {
@@ -502,7 +502,9 @@ public final class PlotModificationManager {
                         }
                         return;
                     }
-                    plot.getPlotModificationManager().autoMerge(event.getDir(), event.getMax(), uuid, player, true);
+                    if (plot.getPlotModificationManager().autoMerge(event.getDir(), event.getMax(), uuid, player, true)) {
+                        PlotSquared.get().getEventDispatcher().callPostMerge(player, plot);
+                    }
                 }
             });
             return true;

Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java

@@ -107,7 +107,7 @@ public class PlotSettings {
 
     public BlockLoc getPosition() {
         if (this.position == null) {
-            return new BlockLoc(0, 0, 0);
+            return BlockLoc.MINY;
         }
         return this.position;
     }

Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java

@@ -426,8 +426,11 @@ public class ExpireManager {
                     .callUnlink(plot.getArea(), plot, true, false,
                             PlotUnlinkEvent.REASON.EXPIRE_DELETE
                     );
-            if (event.getEventResult() != Result.DENY) {
-                plot.getPlotModificationManager().unlinkPlot(event.isCreateRoad(), event.isCreateSign());
+            if (event.getEventResult() != Result.DENY && plot.getPlotModificationManager().unlinkPlot(
+                    event.isCreateRoad(),
+                    event.isCreateSign()
+            )) {
+                this.eventDispatcher.callPostUnlink(plot, PlotUnlinkEvent.REASON.EXPIRE_DELETE);
             }
         }
         for (UUID helper : plot.getTrusted()) {

Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java

@@ -35,8 +35,8 @@ import com.plotsquared.core.generator.GridPlotWorld;
 import com.plotsquared.core.generator.SingleWorldGenerator;
 import com.plotsquared.core.inject.annotations.WorldConfig;
 import com.plotsquared.core.listener.PlotListener;
+import com.plotsquared.core.location.BlockLoc;
 import com.plotsquared.core.location.Location;
-import com.plotsquared.core.location.PlotLoc;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotAreaType;
 import com.plotsquared.core.plot.PlotId;
@@ -74,7 +74,39 @@ public class SinglePlotArea extends GridPlotWorld {
         this.eventDispatcher = eventDispatcher;
         this.plotListener = plotListener;
         this.setAllowSigns(false);
-        this.setDefaultHome(new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE));
+        this.setDefaultHome(new BlockLoc(Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE));
+    }
+
+    /**
+     * Returns true if the given string matches the naming system used to identify single plot worlds
+     * e.g. -1_5 represents plot id *;-1;5. "*" being the plot area name given to single plot world
+     * {@link com.plotsquared.core.plot.PlotArea}.
+     */
+    public static boolean isSinglePlotWorld(String worldName) {
+        int len = worldName.length();
+        int separator = 0;
+        for (int i = 0; i < len; i++) {
+            switch (worldName.charAt(i)) {
+                case '_':
+                    separator++;
+                    break;
+                case '-':
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                    break;
+                default:
+                    return false;
+            }
+        }
+        return separator == 1;
     }
 
     @NonNull

Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java

@@ -51,6 +51,11 @@ import com.plotsquared.core.events.PlotMergeEvent;
 import com.plotsquared.core.events.PlotRateEvent;
 import com.plotsquared.core.events.PlotUnlinkEvent;
 import com.plotsquared.core.events.TeleportCause;
+import com.plotsquared.core.events.post.PostPlayerAutoPlotEvent;
+import com.plotsquared.core.events.post.PostPlotChangeOwnerEvent;
+import com.plotsquared.core.events.post.PostPlotDeleteEvent;
+import com.plotsquared.core.events.post.PostPlotMergeEvent;
+import com.plotsquared.core.events.post.PostPlotUnlinkEvent;
 import com.plotsquared.core.listener.PlayerBlockEventType;
 import com.plotsquared.core.location.Direction;
 import com.plotsquared.core.location.Location;
@@ -135,6 +140,12 @@ public class EventDispatcher {
         return event;
     }
 
+    public PostPlayerAutoPlotEvent callPostAuto(PlotPlayer<?> player, Plot plot) {
+        PostPlayerAutoPlotEvent event = new PostPlayerAutoPlotEvent(player, plot);
+        callEvent(event);
+        return event;
+    }
+
     public PlayerAutoPlotsChosenEvent callAutoPlotsChosen(
             PlotPlayer<?> player, List<Plot> plots
     ) {
@@ -174,6 +185,12 @@ public class EventDispatcher {
         return event;
     }
 
+    public PostPlotDeleteEvent callPostDelete(Plot plot) {
+        PostPlotDeleteEvent event = new PostPlotDeleteEvent(plot);
+        callEvent(event);
+        return event;
+    }
+
     public PlotFlagAddEvent callFlagAdd(PlotFlag<?, ?> flag, Plot plot) {
         PlotFlagAddEvent event = new PlotFlagAddEvent(flag, plot);
         callEvent(event);
@@ -192,6 +209,12 @@ public class EventDispatcher {
         return event;
     }
 
+    public PostPlotMergeEvent callPostMerge(PlotPlayer<?> player, Plot plot) {
+        PostPlotMergeEvent event = new PostPlotMergeEvent(player, plot);
+        callEvent(event);
+        return event;
+    }
+
     public PlotAutoMergeEvent callAutoMerge(Plot plot, List<PlotId> plots) {
         PlotAutoMergeEvent event = new PlotAutoMergeEvent(plot.getWorldName(), plot, plots);
         callEvent(event);
@@ -207,6 +230,12 @@ public class EventDispatcher {
         return event;
     }
 
+    public PostPlotUnlinkEvent callPostUnlink(Plot plot, PlotUnlinkEvent.REASON reason) {
+        PostPlotUnlinkEvent event = new PostPlotUnlinkEvent(plot, reason);
+        callEvent(event);
+        return event;
+    }
+
     public PlayerEnterPlotEvent callEntry(PlotPlayer<?> player, Plot plot) {
         PlayerEnterPlotEvent event = new PlayerEnterPlotEvent(player, plot);
         callEvent(event);
@@ -256,6 +285,12 @@ public class EventDispatcher {
         return event;
     }
 
+    public PostPlotChangeOwnerEvent callPostOwnerChange(PlotPlayer<?> player, Plot plot, @Nullable UUID oldOwner) {
+        PostPlotChangeOwnerEvent event = new PostPlotChangeOwnerEvent(player, plot, oldOwner);
+        callEvent(event);
+        return event;
+    }
+
     public PlotRateEvent callRating(PlotPlayer<?> player, Plot plot, Rating rating) {
         PlotRateEvent event = new PlotRateEvent(player, rating, plot);
         eventBus.post(event);

Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java

@@ -581,6 +581,10 @@ public abstract class SchematicHandler {
         schematic.put("BlockData", new ByteArrayTag(buffer.toByteArray()));
         schematic.put("BlockEntities", new ListTag(CompoundTag.class, tileEntities));
 
+        if (biomeBuffer.size() == 0 || biomePalette.size() == 0) {
+            return;
+        }
+
         schematic.put("BiomePaletteMax", new IntTag(biomePalette.size()));
 
         Map<String, Tag> biomePaletteTag = new HashMap<>();

Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java

@@ -69,6 +69,7 @@ public final class AutoClaimFinishTask implements Callable<Boolean> {
             return false;
         }
         plot.claim(player, true, schematic, false, true);
+        eventDispatcher.callPostAuto(player, plot);
         if (area.isAutoMerge()) {
             PlotMergeEvent event = this.eventDispatcher.callMerge(plot, Direction.ALL, Integer.MAX_VALUE, player);
             if (event.getEventResult() == Result.DENY) {
@@ -77,7 +78,9 @@ public final class AutoClaimFinishTask implements Callable<Boolean> {
                         Templates.of("value", "Auto Merge")
                 );
             } else {
-                plot.getPlotModificationManager().autoMerge(event.getDir(), event.getMax(), player.getUUID(), player, true);
+                if (plot.getPlotModificationManager().autoMerge(event.getDir(), event.getMax(), player.getUUID(), player, true)) {
+                    eventDispatcher.callPostMerge(player, plot);
+                }
             }
         }
         return true;

Core/src/main/resources/lang/messages_en.json

@@ -53,7 +53,9 @@
   "cluster.cluster_regenerated": "<prefix><dark_aqua>Successfully started cluster regeneration.</dark_aqua>",
   "cluster.cluster_teleporting": "<prefix><dark_aqua>Teleporting...</dark_aqua>",
   "cluster.cluster_info": "<prefix><gold>Current cluster: </gold><gray><id></gray>\n<gold>Name: </gold><gray><name></gray>\n<gold>Owner: </gold><gray><owner></gray>\n<gold>Size: </gold><gray><size></gray>\n<gold>Rights: </gold><gray><rights></gray>",
-  "border.border": "<prefix><gray>You are outside the current map border.</gray>",
+  "border.denied": "<prefix><red>You are outside the current map border.</red>",
+  "border.bypass.exited": "<prefix><red>You have bypassed the current map border area.</red>",
+  "border.bypass.entered": "<prefix><gray>You have re-entered the current map border area.</gray>",
   "worldedit.worldedit_bypass": "<prefix><gray><italic>To bypass your restrictions use </gray><dark_aqua><command></dark_aqua></italic>",
   "worldedit.worldedit_bypassed": "<prefix><gray>Currently bypassing WorldEdit restriction.</gray>",
   "gamemode.gamemode_was_bypassed": "<prefix><gold>You bypassed the gamemode (</gold><gray><gamemode></gray><gold>) <gold>set for </gold><gray><plot>.</gray>",
@@ -92,6 +94,7 @@
   "done.done_insufficient_complexity": "<prefix><red>This plot is too simple. Please add more detail before using this command.</red>",
   "done.done_success": "<prefix><gold>Successfully marked this plot as done.</gold>",
   "done.done_removed": "<prefix><gray>You may now continue building in this plot.</gray>",
+  "done.building_restricted": "<prefix><gray>You can't build on plots marked as done.</gray>",
   "ratings.ratings_purged": "<prefix><gray>Purged ratings for this plot.</gray>",
   "ratings.rating_not_valid": "<prefix><red>You need to specify a number between 1 and 10.</red>",
   "ratings.rating_already_exists": "<prefix><gray>You have already rated plot <plot>.</gray>",

Core/src/test/java/com/plotsquared/core/configuration/caption/ClickStripTransformTest.java

@@ -30,14 +30,12 @@ import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import java.util.EnumSet;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
 
 class ClickStripTransformTest {
 
@@ -53,7 +51,7 @@ class ClickStripTransformTest {
                         )
                 );
         var transformedComponent = transform.transform(component);
-        assertNull(transformedComponent.clickEvent());
+        Assertions.assertNull(transformedComponent.clickEvent());
     }
 
     @Test
@@ -68,7 +66,7 @@ class ClickStripTransformTest {
         var component = Component.text("Hello")
                 .clickEvent(originalClickEvent);
         var transformedComponent = transform.transform(component);
-        assertEquals(originalClickEvent, transformedComponent.clickEvent());
+        Assertions.assertEquals(originalClickEvent, transformedComponent.clickEvent());
     }
 
     @Test
@@ -88,9 +86,9 @@ class ClickStripTransformTest {
                         inner.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "https://example.org"))
                 );
         var transformedComponent = transform.transform(component);
-        assertFalse(transformedComponent.children().isEmpty()); // child still exists
-        assertEquals(inner, transformedComponent.children().get(0)); // only the click event has changed
-        assertNull(transformedComponent.children().get(0).clickEvent());
+        Assertions.assertFalse(transformedComponent.children().isEmpty()); // child still exists
+        Assertions.assertEquals(inner, transformedComponent.children().get(0)); // only the click event has changed
+        Assertions.assertNull(transformedComponent.children().get(0).clickEvent());
     }
 
 }

Core/src/test/java/com/plotsquared/core/plot/FlagTest.java

@@ -32,10 +32,9 @@ import com.plotsquared.core.plot.flag.implementations.UseFlag;
 import com.sk89q.worldedit.world.item.ItemType;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class FlagTest {
 
@@ -43,7 +42,7 @@ public class FlagTest {
 
     private ItemType testBlock;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         //EventUtil.manager = new EventUtilTest();
         DBFunc.dbManager = new AbstractDBTest();
@@ -72,7 +71,7 @@ public class FlagTest {
     @Test
     public void testFlagName() {
         String flagName = PlotFlag.getFlagName(UseFlag.class);
-        assertEquals("use", flagName);
+        Assertions.assertEquals("use", flagName);
     }
 
 }

Core/src/test/java/com/plotsquared/core/plot/PlotRangeIteratorTest.java

@@ -25,17 +25,13 @@
  */
 package com.plotsquared.core.plot;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-
 public class PlotRangeIteratorTest {
 
     @Test
@@ -43,10 +39,10 @@ public class PlotRangeIteratorTest {
         // an iterator that should only contain the given plot
         PlotId id = PlotId.of(3, 7);
         PlotId.PlotRangeIterator range = PlotId.PlotRangeIterator.range(id, id);
-        assertTrue(range.hasNext());
-        assertEquals(id, range.next());
-        assertFalse(range.hasNext());
-        assertThrows(NoSuchElementException.class, range::next);
+        Assertions.assertTrue(range.hasNext());
+        Assertions.assertEquals(id, range.next());
+        Assertions.assertFalse(range.hasNext());
+        Assertions.assertThrows(NoSuchElementException.class, range::next);
     }
 
     // the tests below assume a specific order (first increasing y, then increasing x)
@@ -61,11 +57,11 @@ public class PlotRangeIteratorTest {
         List<PlotId> all = Arrays.asList(id00, id01, id10, id11);
         PlotId.PlotRangeIterator range = PlotId.PlotRangeIterator.range(id00, id11);
         for (PlotId id : all) {
-            assertTrue(range.hasNext());
-            assertEquals(id, range.next());
+            Assertions.assertTrue(range.hasNext());
+            Assertions.assertEquals(id, range.next());
         }
-        assertFalse(range.hasNext());
-        assertThrows(NoSuchElementException.class, range::next);
+        Assertions.assertFalse(range.hasNext());
+        Assertions.assertThrows(NoSuchElementException.class, range::next);
     }
 
     @Test
@@ -80,11 +76,11 @@ public class PlotRangeIteratorTest {
         List<PlotId> all = Arrays.asList(id00, id01, id02, id10, id11, id12);
         PlotId.PlotRangeIterator range = PlotId.PlotRangeIterator.range(id00, id12);
         for (PlotId id : all) {
-            assertTrue(range.hasNext());
-            assertEquals(id, range.next());
+            Assertions.assertTrue(range.hasNext());
+            Assertions.assertEquals(id, range.next());
         }
-        assertFalse(range.hasNext());
-        assertThrows(NoSuchElementException.class, range::next);
+        Assertions.assertFalse(range.hasNext());
+        Assertions.assertThrows(NoSuchElementException.class, range::next);
     }
 
     @Test
@@ -99,11 +95,23 @@ public class PlotRangeIteratorTest {
         List<PlotId> all = Arrays.asList(id00, id01, id10, id11, id20, id21);
         PlotId.PlotRangeIterator range = PlotId.PlotRangeIterator.range(id00, id21);
         for (PlotId id : all) {
-            assertTrue(range.hasNext());
-            assertEquals(id, range.next());
+            Assertions.assertTrue(range.hasNext());
+            Assertions.assertEquals(id, range.next());
         }
-        assertFalse(range.hasNext());
-        assertThrows(NoSuchElementException.class, range::next);
+        Assertions.assertFalse(range.hasNext());
+        Assertions.assertThrows(NoSuchElementException.class, range::next);
     }
 
+    @Test
+    public void resetYOfIteratorToStart() {
+        PlotId id00 = PlotId.of(0, 1);
+        PlotId id01 = PlotId.of(1, 2);
+        PlotId.PlotRangeIterator range = PlotId.PlotRangeIterator.range(id00, id01);
+
+        for (int i = 0; i < 4; i++) {
+            Assertions.assertNotEquals(0, range.next().getY());
+        }
+        Assertions.assertFalse(range.hasNext());
+        Assertions.assertThrows(NoSuchElementException.class, range::next);
+    }
 }

Core/src/test/java/com/plotsquared/core/plot/PlotVersionTest.java

@@ -28,7 +28,7 @@ package com.plotsquared.core.plot;
 import com.plotsquared.core.PlotVersion;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PlotVersionTest {
 

Core/src/test/java/com/plotsquared/core/synchronization/LockRepositoryTest.java

@@ -25,6 +25,7 @@
  */
 package com.plotsquared.core.synchronization;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -32,9 +33,6 @@ import org.junit.jupiter.api.Test;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 class LockRepositoryTest {
 
     private LockKey key;
@@ -55,11 +53,9 @@ class LockRepositoryTest {
             throw new IllegalStateException("Expected a ReentrantLock");
         }
 
-        assertThrows(IllegalStateException.class, () -> {
-            this.lockRepository.useLock(this.key, () -> {
-                throw new IllegalStateException();
-            });
-        });
-        assertFalse(lock.isLocked());
+        Assertions.assertThrows(IllegalStateException.class, () -> this.lockRepository.useLock(this.key, () -> {
+            throw new IllegalStateException();
+        }));
+        Assertions.assertFalse(lock.isLocked());
     }
 }

build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
     idea
 }
 
-version = "6.1.3"
+version = "6.2.1"
 
 allprojects {
     group = "com.plotsquared"
@@ -67,8 +67,7 @@ val javadocDir = rootDir.resolve("docs").resolve("javadoc").resolve(project.name
 allprojects {
     dependencies {
         // Tests
-        testImplementation("junit:junit:4.13.2")
-        testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
     }
 
     plugins.withId("java") {
@@ -236,7 +235,7 @@ tasks {
 
                 val rootOptions = aggregatedJavadocs.options as StandardJavadocDocletOptions
                 val subOptions = task.options as StandardJavadocDocletOptions
-                rootOptions.links(*subOptions.links.orEmpty().minus(rootOptions.links.orEmpty()).toTypedArray())
+                rootOptions.links(*subOptions.links.orEmpty().minus(rootOptions.links.orEmpty().toSet()).toTypedArray())
             }
         }
     }

gradle/libs.versions.toml

@@ -1,46 +1,46 @@
 [versions]
 # Minecraft expectations
-guava = "21.0" # Version set by Minecraft
 gson = "2.8.0" # Version set by Minecraft
-log4j-api = "2.14.1" # Version set by Minecraft
+log4j-api = "2.16.0" # Version set by Minecraft
+guava = "21.0" # Version set by Minecraft
 
 # Platform expectations
 paper = "1.17.1-R0.1-SNAPSHOT"
-checker-qual = "3.18.1"
+checker-qual = "3.20.0"
 guice = "5.0.1"
 findbugs = "3.0.1"
 snakeyaml = "1.28" # Version set by Bukkit
 
 # Adventure & MiniMessage
-adventure-api = "4.9.2"
+adventure-api = "4.9.3"
 adventure-text-minimessage = "4.1.0-SNAPSHOT"
-adventure-platform-bukkit = "4.0.0"
+adventure-platform-bukkit = "4.0.1"
 
 # Plugins
-worldedit = "7.2.6"
-fawe = "1.17-343"
+worldedit = "7.2.8"
+fawe = "1.17-419"
 vault = "1.7.1"
 placeholderapi = "2.10.10"
 luckperms = "5.3"
-essentialsx = "2.18.2"
+essentialsx = "2.19.0"
 hyperverse = "0.6.0-SNAPSHOT"
 mvdwapi = "3.1.1"
 
 # Third party
-prtree = "1.5.0"
+prtree = "2.0.0"
 aopalliance = "1.0"
-pipeline = "1.4.0-SNAPSHOT"
-arkitektonika = "2.1.0"
+rorledning = "1.4.0-SNAPSHOT"
+arkitektonika = "2.1.1"
 paster = "1.1.1"
 bstats = "2.2.1"
-paperlib = "1.0.6"
+paperlib = "1.0.7"
 squirrelid = "0.3.0"
 serverlib = "2.3.1"
 http4j = "1.3"
 
 # Gradle plugins
 shadow = "7.1.0"
-grgit = "4.1.0"
+grgit = "4.1.1"
 licenser = "0.6.1"
 nexus = "1.1.0"
 
@@ -50,7 +50,6 @@ paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper"
 checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checker-qual" }
 
 # Minecraft expectations
-guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
 gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 log4j = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j-api" }
 
@@ -73,13 +72,13 @@ fastasyncworldeditCore = { group = "com.fastasyncworldedit", name = "FastAsyncWo
 vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" }
 placeholderapi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderapi" }
 luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" }
-essentialsx = { group = "net.ess3", name = "EssentialsX", version.ref = "essentialsx" }
+essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentialsx" }
 hyperverse = { group = "se.hyperver.hyperverse", name = "Core", version.ref = "hyperverse" }
 
 # Third party
-prtree = { group = "org.khelekore", name = "prtree", version.ref = "prtree" }
+prtree = { group = "com.intellectualsites.prtree", name = "PRTree", version.ref = "prtree" }
 aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopalliance" }
-pipeline = { group = "com.intellectualsites", name = "Pipeline", version.ref = "pipeline" }
+rorledning = { group = "com.intellectualsites", name = "Pipeline", version.ref = "rorledning" }
 mvdwapi = { group = "be.maximvdw", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" }
 squirrelid = { group = "org.enginehub", name = "squirrelid", version.ref = "squirrelid" }
 serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
@@ -88,6 +87,7 @@ paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" }
 arkitektonika = { group = "com.intellectualsites.arkitektonika", name = "Arkitektonika-Client", version.ref = "arkitektonika" }
 http4j = { group = "com.intellectualsites.http", name = "HTTP4J", version.ref = "http4j" }
 paster = { group = "com.intellectualsites.paster", name = "Paster", version.ref = "paster" }
+guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
 
 [plugins]
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

renovate.json

@@ -5,7 +5,8 @@
   ],
   "ignoreDeps": [
     "guava",
-    "com.google.guava:guava",  
+    "com.google.guava:guava",
+    "com.google.code.gson:gson",
     "gson",
     "snakeyaml"
   ],
@@ -14,5 +15,6 @@
     "on monday after 9am"
   ],
   "labels": ["Renovate"],
-  "commitMessagePrefix": "chore: "
+  "commitMessagePrefix": "build: ",
+  "rebaseWhen": "conflicted"
 }