Release 7.2.0

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/label-merge-conflicts.yaml

@@ -0,0 +1,23 @@
+name: "Label conflicting PRs"
+on:
+  push:
+  pull_request_target:
+    types: [ synchronize ]
+  pull_request:
+    types: [ synchronize ]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  main:
+    if: github.event.pull_request.user.login != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Label conflicting PRs
+        uses: eps1lon/actions-label-merge-conflict@v2.1.0
+        with:
+          dirtyLabel: "unresolved-merge-conflict"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "Please take a moment and address the merge conflicts of your pull request. Thanks!"
+          continueOnMissingPermissions: true

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

@@ -135,6 +135,7 @@ import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -1178,6 +1179,17 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                     .append("  • Load Before: ").append(p.getDescription().getLoadBefore()).append("\n")
                     .append("  • Dependencies: ").append(p.getDescription().getDepend()).append("\n")
                     .append("  • Soft Dependencies: ").append(p.getDescription().getSoftDepend()).append("\n");
+            List<RegisteredServiceProvider<?>> providers = Bukkit.getServicesManager().getRegistrations(p);
+            if (!providers.isEmpty()) {
+                msg.append("  • Provided Services: \n");
+                for (RegisteredServiceProvider<?> provider : providers) {
+                    msg.append("    • ")
+                            .append(provider.getService().getName()).append(" = ")
+                            .append(provider.getProvider().getClass().getName())
+                            .append(" (priority: ").append(provider.getPriority()).append(")")
+                            .append("\n");
+                }
+            }
         }
         return msg.toString();
     }

Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java

@@ -33,6 +33,7 @@ import org.bukkit.entity.Ageable;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Bat;
 import org.bukkit.entity.Boat;
+import org.bukkit.entity.Breedable;
 import org.bukkit.entity.ChestedHorse;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
@@ -165,7 +166,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 //this.horse.style = horse.getStyle();
                 //this.horse.color = horse.getColor();
                 storeTameable(horse);
-                storeAgeable(horse);
+                storeBreedable(horse);
                 storeLiving(horse);
                 storeInventory(horse);
                 return;
@@ -173,7 +174,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             // END INVENTORY HOLDER //
             case "WOLF", "OCELOT" -> {
                 storeTameable((Tameable) entity);
-                storeAgeable((Ageable) entity);
+                storeBreedable((Breedable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
@@ -187,18 +188,18 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                     this.dataByte = (byte) 0;
                 }
                 this.dataByte2 = sheep.getColor().getDyeData();
-                storeAgeable(sheep);
+                storeBreedable(sheep);
                 storeLiving(sheep);
                 return;
             }
             case "VILLAGER", "CHICKEN", "COW", "MUSHROOM_COW", "PIG", "TURTLE", "POLAR_BEAR" -> {
-                storeAgeable((Ageable) entity);
+                storeBreedable((Breedable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
             case "RABBIT" -> {
                 this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
-                storeAgeable((Ageable) entity);
+                storeBreedable((Breedable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
@@ -382,6 +383,11 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
     }
 
+    /**
+     * @deprecated Use {@link #restoreBreedable(Breedable)} instead
+     * @since 7.1.0
+     */
+    @Deprecated(forRemoval = true, since = "7.1.0")
     private void restoreAgeable(Ageable entity) {
         if (!this.aged.adult) {
             entity.setBaby();
@@ -392,6 +398,11 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
     }
 
+    /**
+     * @deprecated Use {@link #storeBreedable(Breedable)} instead
+     * @since 7.1.0
+     */
+    @Deprecated(forRemoval = true, since = "7.1.0")
     public void storeAgeable(Ageable aged) {
         this.aged = new AgeableStats();
         this.aged.age = aged.getAge();
@@ -399,6 +410,29 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         this.aged.adult = aged.isAdult();
     }
 
+    /**
+     * @since 7.1.0
+     */
+    private void restoreBreedable(Breedable entity) {
+        if (!this.aged.adult) {
+            entity.setBaby();
+        }
+        entity.setAgeLock(this.aged.locked);
+        if (this.aged.age > 0) {
+            entity.setAge(this.aged.age);
+        }
+    }
+
+    /**
+     * @since 7.1.0
+     */
+    private void storeBreedable(Breedable breedable) {
+        this.aged = new AgeableStats();
+        this.aged.age = breedable.getAge();
+        this.aged.locked = breedable.getAgeLock();
+        this.aged.adult = breedable.isAdult();
+    }
+
     public void storeTameable(Tameable tamed) {
         this.tamed = new TameableStats();
         this.tamed.owner = tamed.getOwner();
@@ -502,7 +536,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 //horse.setStyle(this.horse.style);
                 //horse.setColor(this.horse.color);
                 restoreTameable(horse);
-                restoreAgeable(horse);
+                restoreBreedable(horse);
                 restoreLiving(horse);
                 restoreInventory(horse);
                 return entity;
@@ -510,7 +544,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             // END INVENTORY HOLDER //
             case "WOLF", "OCELOT" -> {
                 restoreTameable((Tameable) entity);
-                restoreAgeable((Ageable) entity);
+                restoreBreedable((Breedable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
@@ -523,12 +557,12 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 if (this.dataByte2 != 0) {
                     sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
                 }
-                restoreAgeable(sheep);
+                restoreBreedable(sheep);
                 restoreLiving(sheep);
                 return sheep;
             }
             case "VILLAGER", "CHICKEN", "COW", "TURTLE", "POLAR_BEAR", "MUSHROOM_COW", "PIG" -> {
-                restoreAgeable((Ageable) entity);
+                restoreBreedable((Breedable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
@@ -537,7 +571,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 if (this.dataByte != 0) {
                     ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
                 }
-                restoreAgeable((Ageable) entity);
+                restoreBreedable((Breedable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }

Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java

@@ -23,13 +23,13 @@ import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 import com.plotsquared.bukkit.BukkitPlatform;
+import com.plotsquared.bukkit.listener.ServerListener;
 import com.plotsquared.bukkit.listener.SingleWorldListener;
 import com.plotsquared.bukkit.player.BukkitPlayerManager;
 import com.plotsquared.bukkit.queue.BukkitChunkCoordinator;
 import com.plotsquared.bukkit.queue.BukkitQueueCoordinator;
 import com.plotsquared.bukkit.schematic.BukkitSchematicHandler;
 import com.plotsquared.bukkit.util.BukkitChunkManager;
-import com.plotsquared.bukkit.util.BukkitEconHandler;
 import com.plotsquared.bukkit.util.BukkitInventoryUtil;
 import com.plotsquared.bukkit.util.BukkitRegionManager;
 import com.plotsquared.bukkit.util.BukkitSetupUtils;
@@ -47,6 +47,9 @@ import com.plotsquared.core.inject.factory.ChunkCoordinatorBuilderFactory;
 import com.plotsquared.core.inject.factory.ChunkCoordinatorFactory;
 import com.plotsquared.core.inject.factory.HybridPlotWorldFactory;
 import com.plotsquared.core.inject.factory.ProgressSubscriberFactory;
+import com.plotsquared.core.player.OfflinePlotPlayer;
+import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.DefaultPlotAreaManager;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.plot.world.SinglePlotAreaManager;
@@ -72,6 +75,8 @@ import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.util.Objects;
+
 public class BukkitModule extends AbstractModule {
 
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitModule.class.getSimpleName());
@@ -128,21 +133,64 @@ public class BukkitModule extends AbstractModule {
     @Provides
     @Singleton
     @NonNull EconHandler provideEconHandler() {
-        if (!Settings.Enabled_Components.ECONOMY) {
+        if (!Settings.Enabled_Components.ECONOMY || !Bukkit.getPluginManager().isPluginEnabled("Vault")) {
             return EconHandler.nullEconHandler();
         }
-        if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-            try {
-                BukkitEconHandler econHandler = new BukkitEconHandler();
-                if (!econHandler.init()) {
-                    LOGGER.warn("Economy is enabled but no plugin is providing an economy service. Falling back...");
-                    return EconHandler.nullEconHandler();
-                }
-                return econHandler;
-            } catch (final Exception ignored) {
-            }
+        // Guice eagerly initializes singletons, so we need to bring the laziness ourselves
+        return new LazyEconHandler();
+    }
+
+    private static final class LazyEconHandler extends EconHandler implements ServerListener.MutableEconHandler {
+        private volatile EconHandler implementation;
+
+        public void setImplementation(EconHandler econHandler) {
+            this.implementation = econHandler;
         }
-        return EconHandler.nullEconHandler();
+
+        @Override
+        public boolean init() {
+            return get().init();
+        }
+
+        @Override
+        public double getBalance(final PlotPlayer<?> player) {
+            return get().getBalance(player);
+        }
+
+        @Override
+        public void withdrawMoney(final PlotPlayer<?> player, final double amount) {
+            get().withdrawMoney(player, amount);
+        }
+
+        @Override
+        public void depositMoney(final PlotPlayer<?> player, final double amount) {
+            get().depositMoney(player, amount);
+        }
+
+        @Override
+        public void depositMoney(final OfflinePlotPlayer player, final double amount) {
+            get().depositMoney(player, amount);
+        }
+
+        @Override
+        public boolean isEnabled(final PlotArea plotArea) {
+            return get().isEnabled(plotArea);
+        }
+
+        @Override
+        public @NonNull String format(final double balance) {
+            return get().format(balance);
+        }
+
+        @Override
+        public boolean isSupported() {
+            return get().isSupported();
+        }
+
+        private EconHandler get() {
+            return Objects.requireNonNull(this.implementation, "EconHandler not ready yet.");
+        }
+
     }
 
 }

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

@@ -33,6 +33,7 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
 import com.plotsquared.core.plot.flag.implementations.BreakFlag;
+import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
 import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
 import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
 import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
@@ -586,6 +587,12 @@ public class BlockEventListener implements Listener {
                 event.setCancelled(true);
             }
         }
+        if (event.getNewState().getType().toString().endsWith("CONCRETE")) {
+            if (!plot.getFlag(ConcreteHardenFlag.class)) {
+                plot.debug("Concrete powder could not harden because concrete-harden = false");
+                event.setCancelled(true);
+            }
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)

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

@@ -608,7 +608,7 @@ public class PlayerEventListener implements Listener {
                 this.tmpTeleport = true;
                 return;
             }
-            int border = area.getBorder();
+            int border = area.getBorder(true);
             int x1;
             if (x2 > border && this.tmpTeleport) {
                 if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
@@ -703,7 +703,7 @@ public class PlayerEventListener implements Listener {
                 this.tmpTeleport = true;
                 return;
             }
-            int border = area.getBorder();
+            int border = area.getBorder(true);
             int z1;
             if (z2 > border && this.tmpTeleport) {
                 if (!pp.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {

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

@@ -21,9 +21,14 @@ package com.plotsquared.bukkit.listener;
 import com.google.inject.Inject;
 import com.plotsquared.bukkit.BukkitPlatform;
 import com.plotsquared.bukkit.placeholder.MVdWPlaceholders;
+import com.plotsquared.bukkit.util.BukkitEconHandler;
+import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.player.ConsolePlayer;
+import com.plotsquared.core.util.EconHandler;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -32,6 +37,8 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class ServerListener implements Listener {
 
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ServerListener.class.getSimpleName());
+
     private final BukkitPlatform plugin;
 
     @Inject
@@ -45,6 +52,29 @@ public class ServerListener implements Listener {
             new MVdWPlaceholders(this.plugin, this.plugin.placeholderRegistry());
             ConsolePlayer.getConsole().sendMessage(TranslatableCaption.of("placeholder.hooked"));
         }
+        if (Settings.Enabled_Components.ECONOMY && Bukkit.getPluginManager().isPluginEnabled("Vault")) {
+            EconHandler econHandler = new BukkitEconHandler();
+            try {
+                if (!econHandler.init()) {
+                    LOGGER.warn("Economy is enabled but no plugin is providing an economy service. Falling back...");
+                    econHandler = EconHandler.nullEconHandler();
+                }
+            } catch (final Exception ignored) {
+                econHandler = EconHandler.nullEconHandler();
+            }
+            if (PlotSquared.platform().econHandler() instanceof MutableEconHandler meh) {
+                meh.setImplementation(econHandler);
+            }
+        }
+    }
+
+    /**
+     * Internal use only. Required to implement lazy econ loading using Guice.
+     *
+     * @since 7.2.0
+     */
+    public interface MutableEconHandler {
+        void setImplementation(EconHandler econHandler);
     }
 
 }

Core/build.gradle.kts

@@ -72,7 +72,6 @@ tasks {
         opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
-        opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")
         opt.isLinkSource = true
         opt.bottom(File("$rootDir/javadocfooter.html").readText())
         opt.isUse = true

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

@@ -19,6 +19,7 @@
 package com.plotsquared.core.command;
 
 import com.google.inject.Inject;
+import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
@@ -101,9 +102,14 @@ public class Add extends Command {
                                 Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
                             player.sendMessage(
                                     TranslatableCaption.of("errors.invalid_player"),
-                                    TagResolver.resolver("value", Tag.inserting(
-                                            PlayerManager.resolveName(uuid).toComponent(player)
-                                    ))
+                                    PlotSquared
+                                            .platform()
+                                            .playerManager()
+                                            .getUsernameCaption(uuid)
+                                            .thenApply(caption -> TagResolver.resolver(
+                                                    "value",
+                                                    Tag.inserting(caption.toComponent(player))
+                                            ))
                             );
                             iterator.remove();
                             continue;
@@ -111,9 +117,11 @@ public class Add extends Command {
                         if (plot.isOwner(uuid)) {
                             player.sendMessage(
                                     TranslatableCaption.of("member.already_added"),
-                                    TagResolver.resolver("player", Tag.inserting(
-                                            PlayerManager.resolveName(uuid).toComponent(player)
-                                    ))
+                                    PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                            .thenApply(caption -> TagResolver.resolver(
+                                                    "player",
+                                                    Tag.inserting(caption.toComponent(player))
+                                            ))
                             );
                             iterator.remove();
                             continue;
@@ -121,9 +129,11 @@ public class Add extends Command {
                         if (plot.getMembers().contains(uuid)) {
                             player.sendMessage(
                                     TranslatableCaption.of("member.already_added"),
-                                    TagResolver.resolver("player", Tag.inserting(
-                                            PlayerManager.resolveName(uuid).toComponent(player)
-                                    ))
+                                    PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                            .thenApply(caption -> TagResolver.resolver(
+                                                    "player",
+                                                    Tag.inserting(caption.toComponent(player))
+                                            ))
                             );
                             iterator.remove();
                             continue;

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

@@ -193,7 +193,7 @@ public class Claim extends SubCommand {
             }
         }
         if (!player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_BORDER)) {
-            int border = area.getBorder();
+            int border = area.getBorder(false);
             if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border && !force) {
                 player.sendMessage(TranslatableCaption.of("border.denied"));
                 return false;

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

@@ -25,6 +25,7 @@ import com.plotsquared.core.player.PlotPlayer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * CommandCategory.
@@ -82,7 +83,7 @@ public enum CommandCategory implements Caption {
     // TODO this method shouldn't be invoked
     @Deprecated
     @Override
-    public String toString() {
+    public @NotNull String toString() {
         return this.caption.getComponent(LocaleHolder.console());
     }
 
@@ -108,4 +109,5 @@ public enum CommandCategory implements Caption {
         return !MainCommand.getInstance().getCommands(this, player).isEmpty();
     }
 
+
 }

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

@@ -29,7 +29,6 @@ import com.plotsquared.core.util.WorldUtil;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.entity.EntityCategory;
 import com.plotsquared.core.util.query.PlotQuery;
-import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.uuid.UUIDMapping;
 import com.sk89q.worldedit.world.entity.EntityType;
 import net.kyori.adventure.text.Component;
@@ -71,7 +70,7 @@ public class Debug extends SubCommand {
                     TranslatableCaption.of("commandconfig.command_syntax"),
                     TagResolver.resolver(
                             "value",
-                            Tag.inserting(Component.text("/plot debug <loadedchunks | player | debug-players | entitytypes | msg>"))
+                            Tag.inserting(Component.text("/plot debug <player | debug-players | entitytypes | msg>"))
                     )
             );
         }
@@ -85,16 +84,6 @@ public class Debug extends SubCommand {
                 return true;
             }
         }
-        if (args.length > 0 && "loadedchunks".equalsIgnoreCase(args[0])) {
-            final long start = System.currentTimeMillis();
-            player.sendMessage(TranslatableCaption.of("debug.fetching_loaded_chunks"));
-            TaskManager.runTaskAsync(() -> player.sendMessage(StaticCaption
-                    .of("Loaded chunks: " + this.worldUtil
-                            .getChunkChunks(player.getLocation().getWorldName())
-                            .size() + " (" + (System.currentTimeMillis()
-                            - start) + "ms) using thread: " + Thread.currentThread().getName())));
-            return true;
-        }
         if (args.length > 0 && "uuids".equalsIgnoreCase(args[0])) {
             final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
             player.sendMessage(
@@ -196,7 +185,7 @@ public class Debug extends SubCommand {
 
     @Override
     public Collection<Command> tab(final PlotPlayer<?> player, String[] args, boolean space) {
-        return Stream.of("loadedchunks", "debug-players", "entitytypes")
+        return Stream.of("debug-players", "entitytypes")
                 .filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH)))
                 .map(value -> new Command(null, false, value, "plots.admin", RequiredType.NONE, null) {
                 }).collect(Collectors.toList());

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

@@ -117,10 +117,11 @@ public class Deny extends SubCommand {
                     } else if (plot.getDenied().contains(uuid)) {
                         player.sendMessage(
                                 TranslatableCaption.of("member.already_added"),
-                                TagResolver.resolver(
+                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                        .thenApply(caption -> TagResolver.resolver(
                                         "player",
-                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
-                                )
+                                        Tag.inserting(caption.toComponent(player))
+                                ))
                         );
                         return;
                     } else {

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

@@ -517,6 +517,7 @@ public class ListCmd extends SubCommand {
                     }
                 }
                 finalResolver.tag("players", Tag.inserting(builder.asComponent()));
+                finalResolver.tag("size", Tag.inserting(Component.text(plot.getConnectedPlots().size())));
                 caption.set(TranslatableCaption.of("info.plot_list_item"));
                 caption.setTagResolvers(finalResolver.build());
             }

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

@@ -31,7 +31,6 @@ import com.plotsquared.core.player.PlayerMetaDataKeys;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.PlayerManager;
 import com.plotsquared.core.util.TabCompletions;
 import com.plotsquared.core.util.task.TaskManager;
 import net.kyori.adventure.text.Component;
@@ -136,10 +135,11 @@ public class Owner extends SetCommand {
             if (plot.isOwner(uuid)) {
                 player.sendMessage(
                         TranslatableCaption.of("member.already_owner"),
-                        TagResolver.resolver(
+                        PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                .thenApply(caption -> TagResolver.resolver(
                                 "player",
-                                Tag.inserting(PlayerManager.resolveName(uuid, false).toComponent(player))
-                        )
+                                Tag.inserting(caption.toComponent(player))
+                        ))
                 );
                 return;
             }
@@ -147,10 +147,11 @@ public class Owner extends SetCommand {
                 if (other == null) {
                     player.sendMessage(
                             TranslatableCaption.of("errors.invalid_player_offline"),
-                            TagResolver.resolver(
+                            PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                    .thenApply(caption -> TagResolver.resolver(
                                     "player",
-                                    Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
-                            )
+                                    Tag.inserting(caption.toComponent(player))
+                            ))
                     );
                     return;
                 }

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

@@ -19,6 +19,7 @@
 package com.plotsquared.core.command;
 
 import com.google.inject.Inject;
+import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
@@ -103,10 +104,11 @@ public class Trust extends Command {
                             player.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
                         player.sendMessage(
                                 TranslatableCaption.of("errors.invalid_player"),
-                                TagResolver.resolver(
+                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                        .thenApply(caption -> TagResolver.resolver(
                                         "value",
-                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
-                                )
+                                        Tag.inserting(caption.toComponent(player))
+                                ))
                         );
                         iterator.remove();
                         continue;
@@ -114,10 +116,11 @@ public class Trust extends Command {
                     if (currentPlot.isOwner(uuid)) {
                         player.sendMessage(
                                 TranslatableCaption.of("member.already_added"),
-                                TagResolver.resolver(
-                                        "value",
-                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
-                                )
+                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                        .thenApply(caption -> TagResolver.resolver(
+                                        "player",
+                                        Tag.inserting(caption.toComponent(player))
+                                ))
                         );
                         iterator.remove();
                         continue;
@@ -125,10 +128,11 @@ public class Trust extends Command {
                     if (currentPlot.getTrusted().contains(uuid)) {
                         player.sendMessage(
                                 TranslatableCaption.of("member.already_added"),
-                                TagResolver.resolver(
-                                        "value",
-                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
-                                )
+                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                        .thenApply(caption -> TagResolver.resolver(
+                                        "player",
+                                        Tag.inserting(caption.toComponent(player))
+                                ))
                         );
                         iterator.remove();
                         continue;

Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java

@@ -44,4 +44,6 @@ public interface Caption {
      */
     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
 
+    @NonNull String toString();
+
 }

Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java

@@ -51,4 +51,9 @@ public final class StaticCaption implements Caption {
         return MiniMessage.miniMessage().deserialize(this.value);
     }
 
+    @Override
+    public @NonNull String toString() {
+        return "StaticCaption(" + value + ")";
+    }
+
 }

Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java

@@ -25,6 +25,7 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Locale;
 import java.util.regex.Pattern;
@@ -132,4 +133,9 @@ public final class TranslatableCaption implements NamespacedCaption {
         return Objects.hashCode(this.getNamespace(), this.getKey());
     }
 
+    @Override
+    public @NotNull String toString() {
+        return "TranslatableCaption(" + getNamespace() + ":" + getKey() + ")";
+    }
+
 }

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

@@ -130,6 +130,7 @@ public class SQLManager implements AbstractDB {
     public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
     // Private
     private Connection connection;
+    private boolean supportsGetGeneratedKeys;
     private boolean closed = false;
 
     /**
@@ -154,6 +155,8 @@ public class SQLManager implements AbstractDB {
         this.worldConfiguration = worldConfiguration;
         this.database = database;
         this.connection = database.openConnection();
+        final DatabaseMetaData databaseMetaData = this.connection.getMetaData();
+        this.supportsGetGeneratedKeys = databaseMetaData.supportsGetGeneratedKeys();
         this.mySQL = database instanceof MySQL;
         this.globalTasks = new ConcurrentLinkedQueue<>();
         this.notifyTasks = new ConcurrentLinkedQueue<>();
@@ -161,6 +164,14 @@ public class SQLManager implements AbstractDB {
         this.playerTasks = new ConcurrentHashMap<>();
         this.clusterTasks = new ConcurrentHashMap<>();
         this.prefix = prefix;
+
+        if (mySQL && !supportsGetGeneratedKeys) {
+            String driver = databaseMetaData.getDriverName();
+            String driverVersion = databaseMetaData.getDriverVersion();
+            throw new SQLException("Database Driver for MySQL does not support Statement#getGeneratedKeys - which breaks " +
+                    "PlotSquared functionality (Using " + driver + ":" + driverVersion + ")");
+        }
+
         this.SET_OWNER = "UPDATE `" + this.prefix
                 + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
         this.GET_ALL_PLOTS =
@@ -171,20 +182,32 @@ public class SQLManager implements AbstractDB {
                 "INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
         this.CREATE_TIERS =
                 "INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
-        this.CREATE_PLOT = "INSERT INTO `" + this.prefix
+        String tempCreatePlot = "INSERT INTO `" + this.prefix
                 + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
-
+        if (!supportsGetGeneratedKeys) {
+            tempCreatePlot += " RETURNING `id`";
+        }
+        this.CREATE_PLOT = tempCreatePlot;
         if (mySQL) {
             this.CREATE_PLOT_SAFE = "INSERT IGNORE INTO `" + this.prefix
                     + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? FROM DUAL WHERE NOT EXISTS (SELECT null FROM `"
                     + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
         } else {
-            this.CREATE_PLOT_SAFE = "INSERT INTO `" + this.prefix
+            String tempCreatePlotSafe = "INSERT INTO `" + this.prefix
                     + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (SELECT null FROM `"
                     + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
+            if (!supportsGetGeneratedKeys) {
+                tempCreatePlotSafe += " RETURNING `id`";
+            }
+            this.CREATE_PLOT_SAFE = tempCreatePlotSafe;
         }
-        this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix
+        String tempCreateCluster = "INSERT INTO `" + this.prefix
                 + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
+        if (!supportsGetGeneratedKeys) {
+            tempCreateCluster += " RETURNING `id`";
+        }
+        this.CREATE_CLUSTER = tempCreateCluster;
+
         try {
             createTables();
         } catch (SQLException e) {
@@ -1073,9 +1096,8 @@ public class SQLManager implements AbstractDB {
 
             @Override
             public void addBatch(PreparedStatement statement) throws SQLException {
-                int inserted = statement.executeUpdate();
-                if (inserted > 0) {
-                    try (ResultSet keys = statement.getGeneratedKeys()) {
+                if (statement.execute() || statement.getUpdateCount() > 0) {
+                    try (ResultSet keys = supportsGetGeneratedKeys ? statement.getGeneratedKeys() : statement.getResultSet()) {
                         if (keys.next()) {
                             plot.temp = keys.getInt(1);
                             addPlotTask(plot, new UniqueStatement(
@@ -1145,8 +1167,8 @@ public class SQLManager implements AbstractDB {
 
             @Override
             public void addBatch(PreparedStatement statement) throws SQLException {
-                statement.executeUpdate();
-                try (ResultSet keys = statement.getGeneratedKeys()) {
+                statement.execute();
+                try (ResultSet keys = supportsGetGeneratedKeys ? statement.getGeneratedKeys() : statement.getResultSet()) {
                     if (keys.next()) {
                         plot.temp = keys.getInt(1);
                     }
@@ -3058,8 +3080,8 @@ public class SQLManager implements AbstractDB {
 
             @Override
             public void addBatch(PreparedStatement statement) throws SQLException {
-                statement.executeUpdate();
-                try (ResultSet keys = statement.getGeneratedKeys()) {
+                statement.execute();
+                try (ResultSet keys = supportsGetGeneratedKeys ? statement.getGeneratedKeys() : statement.getResultSet()) {
                     if (keys.next()) {
                         cluster.temp = keys.getInt(1);
                     }

Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java

@@ -21,26 +21,21 @@ package com.plotsquared.core.events;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.function.UnaryOperator;
 
 /**
  * Called when a player teleports to a plot
  */
 public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements CancellablePlotEvent {
 
+    private final Location from;
     private final TeleportCause cause;
     private Result eventResult;
-    private final Location from;
-    private UnaryOperator<Location> locationTransformer;
-
 
     /**
      * PlayerTeleportToPlotEvent: Called when a player teleports to a plot
      *
      * @param player That was teleported
-     * @param from   The origin location, from where the teleport was triggered (players location most likely)
+     * @param from   Start location
      * @param plot   Plot to which the player was teleported
      * @param cause  Why the teleport is being completed
      * @since 6.1.0
@@ -62,8 +57,7 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
     }
 
     /**
-     * Get the location, from where the teleport was triggered
-     * (the players current location when executing the home command for example)
+     * Get the from location
      *
      * @return Location
      */
@@ -71,27 +65,6 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
         return this.from;
     }
 
-    /**
-     * Gets the currently applied {@link UnaryOperator<Location> transformer} or null, if none was set
-     *
-     * @return LocationTransformer
-     * @since TODO
-     */
-    public @Nullable UnaryOperator<Location> getLocationTransformer() {
-        return this.locationTransformer;
-    }
-
-    /**
-     * Sets the {@link UnaryOperator<Location> transformer} to mutate the location where the player will be teleported to.
-     * May be {@code null}, if any previous set transformations should be discarded.
-     *
-     * @param locationTransformer The new transformer
-     * @since TODO
-     */
-    public void setLocationTransformer(@Nullable UnaryOperator<Location> locationTransformer) {
-        this.locationTransformer = locationTransformer;
-    }
-
     @Override
     public Result getEventResult() {
         return eventResult;

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

@@ -55,7 +55,6 @@ import com.plotsquared.core.plot.flag.implementations.TitlesFlag;
 import com.plotsquared.core.plot.flag.implementations.WeatherFlag;
 import com.plotsquared.core.plot.flag.types.TimedFlag;
 import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.PlayerManager;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.world.gamemode.GameMode;
@@ -63,7 +62,6 @@ import com.sk89q.worldedit.world.gamemode.GameModes;
 import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.item.ItemTypes;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -77,6 +75,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public class PlotListener {
 
@@ -321,22 +320,27 @@ public class PlotListener {
                         }
                         if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
                             final UUID plotOwner = plot.getOwnerAbs();
-                            ComponentLike owner = PlayerManager.resolveName(plotOwner, true).toComponent(player);
                             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");
-                            TagResolver resolver = TagResolver.builder()
-                                    .tag("plot", Tag.inserting(Component.text(lastPlot.getId().toString())))
-                                    .tag("world", Tag.inserting(Component.text(player.getLocation().getWorldName())))
-                                    .tag("owner", Tag.inserting(owner))
-                                    .tag("alias", Tag.inserting(Component.text(plot.getAlias())))
-                                    .build();
-                            if (Settings.Titles.TITLES_AS_ACTIONBAR) {
-                                player.sendActionBar(header, resolver);
-                            } else {
-                                player.sendTitle(header, subHeader, resolver);
-                            }
+
+                            CompletableFuture<TagResolver> future = PlotSquared.platform().playerManager()
+                                    .getUsernameCaption(plotOwner).thenApply(caption -> TagResolver.builder()
+                                            .tag("owner", Tag.inserting(caption.toComponent(player)))
+                                            .tag("plot", Tag.inserting(Component.text(lastPlot.getId().toString())))
+                                            .tag("world", Tag.inserting(Component.text(player.getLocation().getWorldName())))
+                                            .tag("alias", Tag.inserting(Component.text(plot.getAlias())))
+                                            .build()
+                                    );
+
+                            future.whenComplete((tagResolver, throwable) -> {
+                                if (Settings.Titles.TITLES_AS_ACTIONBAR) {
+                                    player.sendActionBar(header, tagResolver);
+                                } else {
+                                    player.sendTitle(header, subHeader, tagResolver);
+                                }
+                            });
                         }
                     }, TaskTime.seconds(1L));
                 }

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

@@ -55,6 +55,25 @@ public enum Direction {
         return NORTH;
     }
 
+    /**
+     * {@return the opposite direction}
+     * If this is {@link Direction#ALL}, then {@link Direction#ALL} is returned.
+     * @since 7.2.0
+     */
+    public Direction opposite() {
+        return switch (this) {
+            case ALL -> ALL;
+            case NORTH -> SOUTH;
+            case EAST -> WEST;
+            case SOUTH -> NORTH;
+            case WEST -> EAST;
+            case NORTHEAST -> SOUTHWEST;
+            case SOUTHEAST -> NORTHWEST;
+            case SOUTHWEST -> NORTHEAST;
+            case NORTHWEST -> SOUTHEAST;
+        };
+    }
+
     public int getIndex() {
         return index;
     }

Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java

@@ -80,6 +80,7 @@ import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -881,7 +882,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
         final Component titleComponent = MiniMessage.miniMessage().deserialize(title.getComponent(this), replacements);
         final Component subtitleComponent =
                 MiniMessage.miniMessage().deserialize(subtitle.getComponent(this), replacements);
-        final Title.Times times = Title.Times.of(
+        final Title.Times times = Title.Times.times(
                 Duration.of(Settings.Titles.TITLES_FADE_IN * 50L, ChronoUnit.MILLIS),
                 Duration.of(Settings.Titles.TITLES_STAY * 50L, ChronoUnit.MILLIS),
                 Duration.of(Settings.Titles.TITLES_FADE_OUT * 50L, ChronoUnit.MILLIS)
@@ -953,6 +954,54 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
         }
     }
 
+    /**
+     * Sends a message to the command caller, when the future is resolved
+     *
+     * @param caption          Caption to send
+     * @param asyncReplacement Async variable replacement
+     * @return A Future to be resolved, after the message was sent
+     * @since 7.1.0
+     */
+    public final CompletableFuture<Void> sendMessage(
+            @NonNull Caption caption,
+            CompletableFuture<@NonNull TagResolver> asyncReplacement
+    ) {
+        return sendMessage(caption, new CompletableFuture[]{asyncReplacement});
+    }
+
+    /**
+     * Sends a message to the command caller, when all futures are resolved
+     *
+     * @param caption           Caption to send
+     * @param asyncReplacements Async variable replacements
+     * @param replacements      Sync variable replacements
+     * @return A Future to be resolved, after the message was sent
+     * @since 7.1.0
+     */
+    public final CompletableFuture<Void> sendMessage(
+            @NonNull Caption caption,
+            CompletableFuture<@NonNull TagResolver>[] asyncReplacements,
+            @NonNull TagResolver... replacements
+    ) {
+        return CompletableFuture.allOf(asyncReplacements).whenComplete((unused, throwable) -> {
+            Set<TagResolver> resolvers = new HashSet<>(Arrays.asList(replacements));
+            if (throwable != null) {
+                sendMessage(
+                        TranslatableCaption.of("errors.error"),
+                        TagResolver.resolver("value", Tag.inserting(
+                                Component.text("Failed to resolve asynchronous caption replacements")
+                        ))
+                );
+                LOGGER.error("Failed to resolve asynchronous tagresolver(s) for " + caption, throwable);
+            } else {
+                for (final CompletableFuture<TagResolver> asyncReplacement : asyncReplacements) {
+                    resolvers.add(asyncReplacement.join());
+                }
+            }
+            sendMessage(caption, resolvers.toArray(TagResolver[]::new));
+        });
+    }
+
     // Redefine from PermissionHolder as it's required from CommandCaller
     @Override
     public boolean hasPermission(@NonNull String permission) {

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

@@ -29,7 +29,6 @@ import com.plotsquared.core.configuration.caption.CaptionUtility;
 import com.plotsquared.core.configuration.caption.StaticCaption;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.events.PlayerTeleportToPlotEvent;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.generator.ClassicPlotWorld;
@@ -86,6 +85,7 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -2284,8 +2284,8 @@ public class Plot {
     }
 
     /**
-     * Gets a set of plots connected (and including) this plot<br>
-     * - This result is cached globally
+     * Gets a set of plots connected (and including) this plot.
+     * The returned set is immutable.
      *
      * @return a Set of Plots connected to this Plot
      */
@@ -2296,117 +2296,75 @@ public class Plot {
         if (!this.isMerged()) {
             return Collections.singleton(this);
         }
+        Plot basePlot = getBasePlot(false);
+        if (this.connectedCache == null && this != basePlot) {
+            // share cache between connected plots
+            Set<Plot> connectedPlots = basePlot.getConnectedPlots();
+            this.connectedCache = connectedPlots;
+            return connectedPlots;
+        }
         if (this.connectedCache != null && this.connectedCache.contains(this)) {
             return this.connectedCache;
         }
 
-        HashSet<Plot> tmpSet = new HashSet<>();
+        Set<Plot> tmpSet = new HashSet<>();
         tmpSet.add(this);
-        Plot tmp;
-        HashSet<Object> queuecache = new HashSet<>();
+        HashSet<Plot> queueCache = new HashSet<>();
         ArrayDeque<Plot> frontier = new ArrayDeque<>();
-        if (this.isMerged(Direction.NORTH)) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(Direction.NORTH));
-            if (!tmp.isMerged(Direction.SOUTH)) {
-                // invalid merge
-                if (tmp.isOwnerAbs(this.getOwnerAbs())) {
-                    tmp.getSettings().setMerged(Direction.SOUTH, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(Direction.NORTH, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        if (this.isMerged(Direction.EAST)) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(Direction.EAST));
-            assert tmp != null;
-            if (!tmp.isMerged(Direction.WEST)) {
-                // invalid merge
-                if (tmp.isOwnerAbs(this.getOwnerAbs())) {
-                    tmp.getSettings().setMerged(Direction.WEST, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(Direction.EAST, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        if (this.isMerged(Direction.SOUTH)) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(Direction.SOUTH));
-            assert tmp != null;
-            if (!tmp.isMerged(Direction.NORTH)) {
-                // invalid merge
-                if (tmp.isOwnerAbs(this.getOwnerAbs())) {
-                    tmp.getSettings().setMerged(Direction.NORTH, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(Direction.SOUTH, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        if (this.isMerged(Direction.WEST)) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(Direction.WEST));
-            if (!tmp.isMerged(Direction.EAST)) {
-                // invalid merge
-                if (tmp.isOwnerAbs(this.getOwnerAbs())) {
-                    tmp.getSettings().setMerged(Direction.EAST, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(Direction.WEST, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
+        computeDirectMerged(queueCache, frontier, Direction.NORTH);
+        computeDirectMerged(queueCache, frontier, Direction.EAST);
+        computeDirectMerged(queueCache, frontier, Direction.SOUTH);
+        computeDirectMerged(queueCache, frontier, Direction.WEST);
         Plot current;
         while ((current = frontier.poll()) != null) {
             if (!current.hasOwner() || current.settings == null) {
                 continue;
             }
             tmpSet.add(current);
-            queuecache.remove(current);
-            if (current.isMerged(Direction.NORTH)) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(Direction.NORTH));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-            if (current.isMerged(Direction.EAST)) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(Direction.EAST));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-            if (current.isMerged(Direction.SOUTH)) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(Direction.SOUTH));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-            if (current.isMerged(Direction.WEST)) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(Direction.WEST));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
+            queueCache.remove(current);
+            addIfIncluded(current, Direction.NORTH, queueCache, tmpSet, frontier);
+            addIfIncluded(current, Direction.EAST, queueCache, tmpSet, frontier);
+            addIfIncluded(current, Direction.SOUTH, queueCache, tmpSet, frontier);
+            addIfIncluded(current, Direction.WEST, queueCache, tmpSet, frontier);
         }
+        tmpSet = Set.copyOf(tmpSet);
         this.connectedCache = tmpSet;
         return tmpSet;
     }
 
+    private void computeDirectMerged(Set<Plot> queueCache, Deque<Plot> frontier, Direction direction) {
+        if (this.isMerged(direction)) {
+            Plot tmp = this.area.getPlotAbs(this.id.getRelative(direction));
+            assert tmp != null;
+            if (!tmp.isMerged(direction.opposite())) {
+                // invalid merge
+                if (tmp.isOwnerAbs(this.getOwnerAbs())) {
+                    tmp.getSettings().setMerged(direction.opposite(), true);
+                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+                } else {
+                    this.getSettings().setMerged(direction, false);
+                    DBFunc.setMerged(this, this.getSettings().getMerged());
+                }
+            }
+            queueCache.add(tmp);
+            frontier.add(tmp);
+        }
+    }
+
+    private void addIfIncluded(
+            Plot current, Direction
+            direction, Set<Plot> queueCache, Set<Plot> tmpSet, Deque<Plot> frontier
+    ) {
+        if (!current.isMerged(direction)) {
+            return;
+        }
+        Plot tmp = current.area.getPlotAbs(current.id.getRelative(direction));
+        if (tmp != null && !queueCache.contains(tmp) && !tmpSet.contains(tmp)) {
+            queueCache.add(tmp);
+            frontier.add(tmp);
+        }
+    }
+
     /**
      * This will combine each plot into effective rectangular regions<br>
      * - This result is cached globally<br>
@@ -2615,9 +2573,8 @@ public class Plot {
      */
     public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) {
         Plot plot = this.getBasePlot(false);
-
-        PlayerTeleportToPlotEvent event = this.eventDispatcher.callTeleport(player, player.getLocation(), plot, cause);
-        if (event.getEventResult() == Result.DENY) {
+        Result result = this.eventDispatcher.callTeleport(player, player.getLocation(), plot, cause).getEventResult();
+        if (result == Result.DENY) {
             player.sendMessage(
                     TranslatableCaption.of("events.event_denied"),
                     TagResolver.resolver("value", Tag.inserting(Component.text("Teleport")))
@@ -2625,10 +2582,7 @@ public class Plot {
             resultConsumer.accept(false);
             return;
         }
-
-        final Consumer<Location> locationConsumer = calculatedLocation -> {
-            Location location = event.getLocationTransformer() == null ? calculatedLocation :
-                    Objects.requireNonNullElse(event.getLocationTransformer().apply(calculatedLocation), calculatedLocation);
+        final Consumer<Location> locationConsumer = location -> {
             if (Settings.Teleport.DELAY == 0 || player.hasPermission("plots.teleport.delay.bypass")) {
                 player.sendMessage(TranslatableCaption.of("teleport.teleported_to_plot"));
                 player.teleport(location, cause);
@@ -2684,6 +2638,11 @@ public class Plot {
         return false;
     }
 
+    /**
+     * Get the maximum distance of the plot from x=0, z=0.
+     *
+     * @return max block distance from 0,0
+     */
     public int getDistanceFromOrigin() {
         Location bot = getManager().getPlotBottomLocAbs(id);
         Location top = getManager().getPlotTopLocAbs(id);
@@ -2697,7 +2656,7 @@ public class Plot {
      * Expands the world border to include this plot if it is beyond the current border.
      */
     public void updateWorldBorder() {
-        int border = this.area.getBorder();
+        int border = this.area.getBorder(false);
         if (border == Integer.MAX_VALUE) {
             return;
         }

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

@@ -51,6 +51,8 @@ import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.PlotExpression;
 import com.plotsquared.core.util.RegionUtil;
 import com.plotsquared.core.util.StringMan;
+import com.plotsquared.core.util.task.TaskManager;
+import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.CuboidRegion;
@@ -145,6 +147,7 @@ public abstract class PlotArea implements ComponentLike {
     private Map<String, PlotExpression> prices = new HashMap<>();
     private List<String> schematics = new ArrayList<>();
     private boolean worldBorder = false;
+    private int borderSize = 1;
     private boolean useEconomy = false;
     private int hash;
     private CuboidRegion region;
@@ -354,6 +357,7 @@ public abstract class PlotArea implements ComponentLike {
         this.plotChat = config.getBoolean("chat.enabled");
         this.forcingPlotChat = config.getBoolean("chat.forced");
         this.worldBorder = config.getBoolean("world.border");
+        this.borderSize = config.getInt("world.border_size");
         this.maxBuildHeight = config.getInt("world.max_height");
         this.minBuildHeight = config.getInt("world.min_height");
         this.minGenHeight = config.getInt("world.min_gen_height");
@@ -391,6 +395,28 @@ public abstract class PlotArea implements ComponentLike {
             }
         }
 
+        this.spawnEggs = config.getBoolean("event.spawn.egg");
+        this.spawnCustom = config.getBoolean("event.spawn.custom");
+        this.spawnBreeding = config.getBoolean("event.spawn.breeding");
+
+        if (PlotSquared.get().isWeInitialised()) {
+            loadFlags(config);
+        } else {
+            ConsolePlayer.getConsole().sendMessage(
+                    TranslatableCaption.of("flags.delaying_loading_area_flags"),
+                    TagResolver.resolver("area", Tag.inserting(Component.text(this.id == null ? this.worldName : this.id)))
+            );
+            TaskManager.runTaskLater(() -> loadFlags(config), TaskTime.ticks(1));
+        }
+
+        loadConfiguration(config);
+    }
+
+    private void loadFlags(ConfigurationSection config) {
+        ConsolePlayer.getConsole().sendMessage(
+                TranslatableCaption.of("flags.loading_area_flags"),
+                TagResolver.resolver("area", Tag.inserting(Component.text(this.id == null ? this.worldName : this.id)))
+        );
         List<String> flags = config.getStringList("flags.default");
         if (flags.isEmpty()) {
             flags = config.getStringList("flags");
@@ -411,10 +437,6 @@ public abstract class PlotArea implements ComponentLike {
                 TagResolver.resolver("flags", Tag.inserting(Component.text(flags.toString())))
         );
 
-        this.spawnEggs = config.getBoolean("event.spawn.egg");
-        this.spawnCustom = config.getBoolean("event.spawn.custom");
-        this.spawnBreeding = config.getBoolean("event.spawn.breeding");
-
         List<String> roadflags = config.getStringList("road.flags");
         if (roadflags.isEmpty()) {
             roadflags = new ArrayList<>();
@@ -426,14 +448,12 @@ public abstract class PlotArea implements ComponentLike {
                 }
             }
         }
-        this.roadFlags = roadflags.size() > 0;
+        this.roadFlags = !roadflags.isEmpty();
         parseFlags(this.getRoadFlagContainer(), roadflags);
         ConsolePlayer.getConsole().sendMessage(
                 TranslatableCaption.of("flags.road_flags"),
                 TagResolver.resolver("flags", Tag.inserting(Component.text(roadflags.toString())))
         );
-
-        loadConfiguration(config);
     }
 
     public abstract void loadConfiguration(ConfigurationSection config);
@@ -471,6 +491,7 @@ public abstract class PlotArea implements ComponentLike {
         options.put("event.spawn.custom", this.isSpawnCustom());
         options.put("event.spawn.breeding", this.isSpawnBreeding());
         options.put("world.border", this.hasWorldBorder());
+        options.put("world.border_size", this.getBorderSize());
         options.put("home.default", "side");
         String position = config.getString(
                 "home.nonmembers",
@@ -919,7 +940,9 @@ public abstract class PlotArea implements ComponentLike {
      * Get the plot border distance for a world<br>
      *
      * @return The border distance or Integer.MAX_VALUE if no border is set
+     * @deprecated Use {@link PlotArea#getBorder(boolean)}
      */
+    @Deprecated(forRemoval = true, since = "7.2.0")
     public int getBorder() {
         final Integer meta = (Integer) getMeta("worldBorder");
         if (meta != null) {
@@ -933,6 +956,27 @@ public abstract class PlotArea implements ComponentLike {
         return Integer.MAX_VALUE;
     }
 
+    /**
+     * Get the plot border distance for a world, specifying whether the returned value should include the world.border-size
+     * value. This is a player-traversable area, where plots cannot be claimed
+     *
+     * @param getExtended If the extra border given by world.border-size should be included
+     * @return Border distance of Integer.MAX_VALUE if no border is set
+     * @since 7.2.0
+     */
+    public int getBorder(boolean getExtended) {
+        final Integer meta = (Integer) getMeta("worldBorder");
+        if (meta != null) {
+            int border = meta + 1;
+            if (border == 0) {
+                return Integer.MAX_VALUE;
+            } else {
+                return getExtended ? border + borderSize : border;
+            }
+        }
+        return Integer.MAX_VALUE;
+    }
+
     /**
      * Setup the plot border for a world (usually done when the world is created).
      */
@@ -1192,6 +1236,16 @@ public abstract class PlotArea implements ComponentLike {
         return worldBorder;
     }
 
+    /**
+     * Get the "extra border" size of the plot area.
+     *
+     * @return Plot area extra border size
+     * @since 7.2.0
+     */
+    public int getBorderSize() {
+        return borderSize;
+    }
+
     /**
      * Get whether plot signs are allowed or not.
      *

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

@@ -38,7 +38,6 @@ import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.queue.QueueCoordinator;
-import com.plotsquared.core.util.PlayerManager;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.function.pattern.Pattern;
@@ -59,6 +58,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -383,13 +383,17 @@ public final class PlotModificationManager {
         }
         if (createSign) {
             queue.setCompleteTask(() -> TaskManager.runTaskAsync(() -> {
-                for (Plot current : plots) {
-                    current.getPlotModificationManager().setSign(PlayerManager.resolveName(current.getOwnerAbs()).getComponent(
-                            LocaleHolder.console()));
-                }
-                if (whenDone != null) {
-                    TaskManager.runTask(whenDone);
-                }
+                List<CompletableFuture<Void>> tasks = plots.stream().map(current -> PlotSquared.platform().playerManager()
+                                .getUsernameCaption(current.getOwnerAbs())
+                                .thenAccept(caption -> current
+                                        .getPlotModificationManager()
+                                        .setSign(caption.getComponent(LocaleHolder.console()))))
+                        .toList();
+                CompletableFuture.allOf(tasks.toArray(CompletableFuture[]::new)).whenComplete((unused, throwable) -> {
+                    if (whenDone != null) {
+                        TaskManager.runTask(whenDone);
+                    }
+                });
             }));
         } else if (whenDone != null) {
             queue.setCompleteTask(whenDone);

Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java

@@ -29,6 +29,7 @@ import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
 import com.plotsquared.core.plot.flag.implementations.BreakFlag;
 import com.plotsquared.core.plot.flag.implementations.ChatFlag;
+import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
 import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
 import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
@@ -142,6 +143,7 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(BeaconEffectsFlag.BEACON_EFFECT_TRUE);
         this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
         this.addFlag(ChatFlag.CHAT_FLAG_TRUE);
+        this.addFlag(ConcreteHardenFlag.CONCRETE_HARDEN_TRUE);
         this.addFlag(CopperOxideFlag.COPPER_OXIDE_FALSE);
         this.addFlag(CoralDryFlag.CORAL_DRY_FALSE);
         this.addFlag(CropGrowFlag.CROP_GROW_TRUE);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ConcreteHardenFlag.java

@@ -0,0 +1,39 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * 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.plot.flag.implementations;
+
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.plot.flag.types.BooleanFlag;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+public class ConcreteHardenFlag extends BooleanFlag<ConcreteHardenFlag> {
+
+    public static final ConcreteHardenFlag CONCRETE_HARDEN_TRUE = new ConcreteHardenFlag(true);
+    public static final ConcreteHardenFlag CONCRETE_HARDEN_FALSE = new ConcreteHardenFlag(false);
+
+    private ConcreteHardenFlag(boolean value) {
+        super(value, TranslatableCaption.of("flags.flag_description_concrete_harden"));
+    }
+
+    @Override
+    protected ConcreteHardenFlag flagOf(@NonNull Boolean value) {
+        return value ? CONCRETE_HARDEN_TRUE : CONCRETE_HARDEN_FALSE;
+    }
+
+}

Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java

@@ -183,7 +183,7 @@ public class ChunkCoordinatorBuilder {
      * Set whether the chunks should be allow to unload after being accessed. This should only be used where the chunks are read from
      * and then written to from a separate queue where they're consequently unloaded.
      *
-     * @param unloadAfter if to unload chuns afterwards
+     * @param unloadAfter if to unload chunks afterwards
      * @return this ChunkCoordinatorBuilder instance
      */
     public @NonNull ChunkCoordinatorBuilder unloadAfter(final boolean unloadAfter) {

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

@@ -42,28 +42,14 @@ public class EntityUtil {
     }
 
     private static int capNumeral(final @NonNull String flagName) {
-        int i;
-        switch (flagName) {
-            case "mob-cap":
-                i = CAP_MOB;
-                break;
-            case "hostile-cap":
-                i = CAP_MONSTER;
-                break;
-            case "animal-cap":
-                i = CAP_ANIMAL;
-                break;
-            case "vehicle-cap":
-                i = CAP_VEHICLE;
-                break;
-            case "misc-cap":
-                i = CAP_MISC;
-                break;
-            case "entity-cap":
-            default:
-                i = CAP_ENTITY;
-        }
-        return i;
+        return switch (flagName) {
+            case "mob-cap" -> CAP_MOB;
+            case "hostile-cap" -> CAP_MONSTER;
+            case "animal-cap" -> CAP_ANIMAL;
+            case "vehicle-cap" -> CAP_VEHICLE;
+            case "misc-cap" -> CAP_MISC;
+            default -> CAP_ENTITY;
+        };
     }
 
     @SuppressWarnings("unchecked")

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

@@ -28,6 +28,7 @@ import com.plotsquared.core.database.DBFunc;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.OfflinePlotPlayer;
 import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.uuid.UUIDMapping;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
@@ -37,6 +38,7 @@ import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.Contract;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -48,6 +50,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 
@@ -169,7 +172,9 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
      * @return A caption containing either the name, {@code None}, {@code Everyone} or {@code Unknown}
      * @see #resolveName(UUID, boolean)
      * @since 6.4.0
+     * @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)}
      */
+    @Deprecated(since = "7.1.0")
     public static @NonNull Caption resolveName(final @Nullable UUID owner) {
         return resolveName(owner, true);
     }
@@ -181,7 +186,9 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
      * @param blocking If the operation should block the current thread for {@link Settings.UUID#BLOCKING_TIMEOUT} milliseconds
      * @return A caption containing either the name, {@code None}, {@code Everyone} or {@code Unknown}
      * @since 6.4.0
+     * @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)}
      */
+    @Deprecated(since = "7.1.0")
     public static @NonNull Caption resolveName(final @Nullable UUID owner, final boolean blocking) {
         if (owner == null) {
             return TranslatableCaption.of("info.none");
@@ -211,6 +218,50 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
         return StaticCaption.of(name);
     }
 
+    /**
+     * Resolves a UUID to a formatted {@link Caption} representing the player behind the UUID.
+     * Returns a {@link CompletableFuture} instead of a plain {@link UUID} as this method may query the
+     * {@link com.plotsquared.core.uuid.UUIDPipeline ImpromptuUUIDPipeline}.
+     * <br>
+     * Special Cases:
+     * <ul>
+     *     <li>{@code null}: Resolves to a {@link TranslatableCaption} with the key {@code info.none}</li>
+     *     <li>{@link DBFunc#EVERYONE}: Resolves to a {@link TranslatableCaption} with the key {@code info.everyone}</li>
+     *     <li>{@link DBFunc#SERVER}: Resolves to a {@link TranslatableCaption} with the key {@code info.server}</li>
+     * </ul>
+     * <br>
+     * Otherwise, if the UUID is a valid UUID and not reserved by PlotSquared itself, this method first attempts to query the
+     * online players ({@link #getPlayerIfExists(UUID)}) for the specific UUID.
+     * If no online player was found for that UUID, the {@link com.plotsquared.core.uuid.UUIDPipeline ImpromptuUUIDPipeline} is
+     * queried to retrieve the known username
+     *
+     * @param uuid The UUID of the player (for example provided by {@link Plot#getOwner()}
+     * @return A CompletableFuture resolving to a Caption representing the players name of the uuid
+     * @since 7.1.0
+     */
+    @Contract("_->!null")
+    public @NonNull CompletableFuture<Caption> getUsernameCaption(@Nullable UUID uuid) {
+        if (uuid == null) {
+            return CompletableFuture.completedFuture(TranslatableCaption.of("info.none"));
+        }
+        if (uuid.equals(DBFunc.EVERYONE)) {
+            return CompletableFuture.completedFuture(TranslatableCaption.of("info.everyone"));
+        }
+        if (uuid.equals(DBFunc.SERVER)) {
+            return CompletableFuture.completedFuture(TranslatableCaption.of("info.server"));
+        }
+        P player = getPlayerIfExists(uuid);
+        if (player != null) {
+            return CompletableFuture.completedFuture(StaticCaption.of(player.getName()));
+        }
+        return PlotSquared.get().getImpromptuUUIDPipeline().getNames(Collections.singleton(uuid)).thenApply(mapping -> {
+            if (mapping.isEmpty()) {
+                return TranslatableCaption.of("info.unknown");
+            }
+            return StaticCaption.of(mapping.get(0).username());
+        });
+    }
+
     /**
      * Remove a player from the player map
      *

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

@@ -173,7 +173,7 @@ public final class TabCompletions {
             return Collections.emptyList();
         }
         final List<String> commands = new ArrayList<>();
-        for (int i = offset; i < highestLimit && (offset - i + amountLimit) > 0; i++) {
+        for (int i = offset; i <= highestLimit && (offset - i + amountLimit) > 0; i++) {
             commands.add(String.valueOf(i));
         }
         return asCompletions(commands.toArray(new String[0]));

Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java

@@ -47,6 +47,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 
 /**
@@ -109,9 +110,9 @@ public final class PlaceholderRegistry {
             if (plotOwner == null) {
                 return legacyComponent(TranslatableCaption.of("generic.generic_unowned"), player);
             }
-
             try {
-                return PlayerManager.resolveName(plotOwner, false).getComponent(player);
+                return PlotSquared.platform().playerManager().getUsernameCaption(plotOwner)
+                        .get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS).getComponent(player);
             } catch (final Exception ignored) {
             }
             return legacyComponent(TranslatableCaption.of("info.unknown"), player);
@@ -187,6 +188,7 @@ public final class PlaceholderRegistry {
             }
         });
         this.createPlaceholder("currentplot_biome", (player, plot) -> plot.getBiomeSynchronous().toString());
+        this.createPlaceholder("currentplot_size", (player, plot) -> String.valueOf(plot.getConnectedPlots().size()));
     }
 
     /**

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

@@ -551,6 +551,7 @@
   "flags.flag_description_block_burn": "<gray>Set to `true` to allow blocks to burn within the plot.</gray>",
   "flags.flag_description_block_ignition": "<gray>Set to `false` to prevent blocks from igniting within the plot.</gray>",
   "flags.flag_description_break": "<gray>Define a list of materials players should be able to break even when they aren't added to the plot.</gray>",
+  "flags.flag_description_concrete_harden": "<gray>Set to `false` to disable concrete powder forming to concrete with water.</gray>",
   "flags.flag_description_device_interact": "<gray>Set to `true` to allow devices to be interacted with in the plot.</gray>",
   "flags.flag_description_disable_physics": "<gray>Set to `true` to disable block physics in the plot.</gray>",
   "flags.flag_description_drop_protection": "<gray>Set to `true` to prevent dropped items from being picked up by non-members of the plot.</gray>",
@@ -631,6 +632,8 @@
   "flags.flag_error_double": "Flag value must be a decimal number.",
   "flags.flag_error_music": "Flag value must be a valid music disc ID.",
   "flags.flag_error_title": "Flag value must be in the format </red><grey>\"A title\" \"The subtitle\"</grey><red>.",
+  "flags.delaying_loading_area_flags": "<prefix><gray>Delaying loading flags for area `</gray><dark_aqua><area></dark_aqua><gray>` as WorldEdit is not initialised yet.</gray>",
+  "flags.loading_area_flags": "<prefix><gray>Loading flags for area: </gray><dark_aqua><area></dark_aqua>",
   "flags.area_flags": "<prefix><gray>Area flags: </gray><dark_aqua><flags></dark_aqua>",
   "flags.road_flags": "<prefix><gray>Road flags: </gray><dark_aqua><flags></dark_aqua>",
   "commands.description.add": "<gray>Allow a user to build in a plot while the plot owner is online.</gray>",

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.0.1-SNAPSHOT"
+version = "7.2.0"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -150,22 +150,26 @@ subprojects {
                             id.set("Sauilitired")
                             name.set("Alexander Söderberg")
                             organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
                         }
                         developer {
                             id.set("NotMyFault")
                             name.set("Alexander Brandes")
                             organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
                             email.set("contact(at)notmyfault.dev")
                         }
                         developer {
                             id.set("SirYwell")
                             name.set("Hannes Greule")
                             organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
                         }
                         developer {
                             id.set("dordsor21")
                             name.set("dordsor21")
                             organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
                         }
                     }
 
@@ -222,20 +226,25 @@ tasks.getByName<Jar>("jar") {
 
 val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.2")
 tasks {
-    val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
-    val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>)
-            .map { it as Map<*, *> }
-            .map { it["fileName"] as String }
-            .first { it.contains("Bukkit") }
+    register("cacheLatestFaweArtifact") {
+        val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
+        val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>)
+                .map { it as Map<*, *> }
+                .map { it["fileName"] as String }
+                .first { it -> it.contains("Bukkit") }
+        project.ext["faweArtifact"] = artifact
+    }
 
     supportedVersions.forEach {
         register<RunServer>("runServer-$it") {
+            dependsOn(getByName("cacheLatestFaweArtifact"))
             minecraftVersion(it)
-            pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
+            pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false)
+                    .map { task -> (task as Jar).archiveFile }
                     .toTypedArray())
             jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
             downloadPlugins {
-                url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/$artifact")
+                url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/${project.ext["faweArtifact"]}")
             }
             group = "run paper"
             runDirectory.set(file("run-$it"))

gradle/libs.versions.toml

@@ -2,8 +2,8 @@
 # Platform expectations
 paper = "1.20.2-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.7.3"
-checkerqual = "3.38.0"
+spotbugs = "4.8.0"
+checkerqual = "3.39.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
@@ -12,9 +12,9 @@ adventure-bukkit = "4.3.1"
 log4j = "2.19.0"
 
 # Plugins
-worldedit = "7.2.16"
-fawe = "2.8.0"
-placeholderapi = "2.11.4"
+worldedit = "7.2.17"
+fawe = "2.8.1"
+placeholderapi = "2.11.5"
 luckperms = "5.4"
 essentialsx = "2.20.1"
 mvdwapi = "3.1.1"
@@ -28,7 +28,7 @@ squirrelid = "0.3.2"
 paster = "1.1.5"
 bstats = "3.0.2"
 paperlib = "1.0.8"
-informative-annotations = "1.3"
+informative-annotations = "1.4"
 vault = "1.7.1"
 serverlib = "2.3.4"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \