fix: update resolver tag names for list command

- fixes #3850

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,7 +27,7 @@ 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.20.2'
+        - '1.20.4'
         - '1.20'
         - '1.19.4'
         - '1.19.3'

.github/renovate.json

@@ -14,6 +14,6 @@
     "com.google.code.gson:gson",
     "com.google.guava:guava",
     "org.yaml:snakeyaml",
-    "org.apache.logging.log4j:log4j-api",
+    "org.apache.logging.log4j:log4j-api"
   ]
 }

.github/workflows/build-pr.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17

.github/workflows/codeql.yml

@@ -22,15 +22,15 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.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/build.gradle.kts

@@ -67,6 +67,7 @@ tasks.named<ShadowJar>("shadowJar") {
         exclude(dependency("org.checkerframework:"))
     }
 
+    relocate("net.kyori.option", "com.plotsquared.core.configuration.option")
     relocate("net.kyori.adventure", "com.plotsquared.core.configuration.adventure")
     relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
     relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
@@ -89,8 +90,6 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("net.jcip", "com.plotsquared.core.annotations.jcip")
     relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs")
     relocate("com.intellectualsites.annotations", "com.plotsquared.core.annotations.informative")
-    relocate("org.jdbi.v3", "com.plotsquared.core.jdbi")
-    relocate("com.zaxxer.hikari", "com.plotsquared.core.hikari")
 
     // Get rid of all the libs which are 100% unused.
     minimize()
@@ -107,7 +106,7 @@ tasks {
         opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
         opt.links("https://jd.advntr.dev/api/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://checkerframework.org/api/")
         opt.isLinkSource = true
         opt.bottom(File("$rootDir/javadocfooter.html").readText())
         opt.isUse = true

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

@@ -37,6 +37,7 @@ import com.plotsquared.bukkit.listener.EntityEventListener;
 import com.plotsquared.bukkit.listener.EntitySpawnListener;
 import com.plotsquared.bukkit.listener.PaperListener;
 import com.plotsquared.bukkit.listener.PlayerEventListener;
+import com.plotsquared.bukkit.listener.PlayerEventListener1201;
 import com.plotsquared.bukkit.listener.ProjectileEventListener;
 import com.plotsquared.bukkit.listener.ServerListener;
 import com.plotsquared.bukkit.listener.SingleWorldListener;
@@ -82,8 +83,6 @@ import com.plotsquared.core.inject.annotations.DefaultGenerator;
 import com.plotsquared.core.inject.annotations.ImpromptuPipeline;
 import com.plotsquared.core.inject.annotations.WorldConfig;
 import com.plotsquared.core.inject.annotations.WorldFile;
-import com.plotsquared.core.inject.modules.DatabaseModule;
-import com.plotsquared.core.inject.modules.JdbiModule;
 import com.plotsquared.core.inject.modules.PlotSquaredModule;
 import com.plotsquared.core.listener.PlotListener;
 import com.plotsquared.core.listener.WESubscriber;
@@ -137,12 +136,12 @@ 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;
 import org.incendo.serverlib.ServerLib;
 
-import javax.xml.crypto.Data;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -295,9 +294,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         new WorldManagerModule(),
                         new PlotSquaredModule(),
                         new BukkitModule(this),
-                        new BackupModule(),
-                        new JdbiModule(),
-                        new DatabaseModule()
+                        new BackupModule()
                 );
         this.injector.injectMembers(this);
 
@@ -363,6 +360,9 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         if (Settings.Enabled_Components.EVENTS) {
             getServer().getPluginManager().registerEvents(injector().getInstance(PlayerEventListener.class), this);
+            if ((serverVersion()[1] == 20 && serverVersion()[2] >= 1) || serverVersion()[1] > 20) {
+                getServer().getPluginManager().registerEvents(injector().getInstance(PlayerEventListener1201.class), this);
+            }
             getServer().getPluginManager().registerEvents(injector().getInstance(BlockEventListener.class), this);
             if (serverVersion()[1] >= 17) {
                 getServer().getPluginManager().registerEvents(injector().getInstance(BlockEventListener117.class), this);
@@ -818,6 +818,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         case "MINECART_MOB_SPAWNER":
                         case "ENDER_CRYSTAL":
                         case "MINECART_TNT":
+                        case "CHEST_BOAT":
                         case "BOAT":
                             if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
                                 com.plotsquared.core.location.Location location = BukkitUtil.adapt(entity.getLocation());
@@ -1183,6 +1184,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/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

@@ -261,7 +261,10 @@ public class BlockEventListener implements Listener {
                 final BlockFace facing = piston.getFacing();
                 location = location.add(facing.getModX(), facing.getModY(), facing.getModZ());
                 Plot newPlot = area.getOwnedPlotAbs(location);
-                if (!plot.equals(newPlot)) {
+                if (plot.equals(newPlot)) {
+                    return;
+                }
+                if (!plot.isMerged() || !plot.getConnectedPlots().contains(newPlot)) {
                     event.setCancelled(true);
                     plot.debug("Prevented piston update because of invalid edge piston detection");
                 }

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

@@ -35,6 +35,7 @@ import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
 import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
 import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
 import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
+import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlotFlagUtil;
@@ -143,6 +144,10 @@ public class EntityEventListener implements Listener {
         if (area == null) {
             return;
         }
+        // Armour-stands are handled elsewhere and should not be handled by area-wide entity-spawn options
+        if (entity.getType() == EntityType.ARMOR_STAND) {
+            return;
+        }
         CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
         switch (reason.toString()) {
             case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
@@ -153,7 +158,7 @@ public class EntityEventListener implements Listener {
             }
             case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
                     "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
-                    "DUPLICATION", "FROZEN", "SPELL" -> {
+                    "DUPLICATION", "FROZEN", "SPELL", "DEFAULT" -> {
                 if (!area.isMobSpawning()) {
                     event.setCancelled(true);
                     return;
@@ -166,7 +171,7 @@ public class EntityEventListener implements Listener {
                 }
             }
             case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
-                if (!area.isSpawnCustom() && entity.getType() != EntityType.ARMOR_STAND) {
+                if (!area.isSpawnCustom()) {
                     event.setCancelled(true);
                     return;
                 }
@@ -354,13 +359,13 @@ public class EntityEventListener implements Listener {
             if (shooter instanceof Player) {
                 PlotPlayer<?> pp = BukkitUtil.adapt((Player) shooter);
                 if (plot == null) {
-                    if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
+                    if (area.isRoadFlags() && !area.getRoadFlag(ProjectileChangeBlockFlag.class) && !pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
                         entity.remove();
                         event.setCancelled(true);
                     }
                     return;
                 }
-                if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
+                if (plot.isAdded(pp.getUUID()) || plot.getFlag(ProjectileChangeBlockFlag.class) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                     return;
                 }
                 entity.remove();

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

@@ -124,7 +124,7 @@ public class PaperListener implements Listener {
         }
         Slime slime = event.getEntity();
 
-        Block b = slime.getTargetBlock(4);
+        Block b = slime.getTargetBlockExact(4);
         if (b == null) {
             return;
         }
@@ -166,12 +166,16 @@ public class PaperListener implements Listener {
         }
         Location location = BukkitUtil.adapt(event.getSpawnLocation());
         PlotArea area = location.getPlotArea();
-        if (!location.isPlotArea()) {
+        if (area == null) {
             return;
         }
-        //If entities are spawning... the chunk should be loaded?
+        // Armour-stands are handled elsewhere and should not be handled by area-wide entity-spawn options
+        if (event.getType() == EntityType.ARMOR_STAND) {
+            return;
+        }
+        // If entities are spawning... the chunk should be loaded?
         Entity[] entities = event.getSpawnLocation().getChunk().getEntities();
-        if (entities.length > Settings.Chunk_Processor.MAX_ENTITIES) {
+        if (entities.length >= Settings.Chunk_Processor.MAX_ENTITIES) {
             event.setShouldAbortSpawn(true);
             event.setCancelled(true);
             return;
@@ -200,7 +204,7 @@ public class PaperListener implements Listener {
                 }
             }
             case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
-                if (!area.isSpawnCustom() && event.getType() != EntityType.ARMOR_STAND) {
+                if (!area.isSpawnCustom()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;

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

@@ -50,6 +50,7 @@ import com.plotsquared.core.plot.flag.implementations.DenyPortalsFlag;
 import com.plotsquared.core.plot.flag.implementations.DenyTeleportFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag;
+import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
 import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag;
 import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag;
 import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag;
@@ -87,6 +88,7 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
+import org.bukkit.block.Sign;
 import org.bukkit.block.data.Waterlogged;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.ArmorStand;
@@ -175,6 +177,33 @@ public class PlayerEventListener implements Listener {
             Material.WRITABLE_BOOK,
             Material.WRITTEN_BOOK
     );
+    private static final Set<String> DYES;
+    static {
+        Set<String> mutableDyes = new HashSet<>(Set.of(
+                "WHITE_DYE",
+                "LIGHT_GRAY_DYE",
+                "GRAY_DYE",
+                "BLACK_DYE",
+                "BROWN_DYE",
+                "RED_DYE",
+                "ORANGE_DYE",
+                "YELLOW_DYE",
+                "LIME_DYE",
+                "GREEN_DYE",
+                "CYAN_DYE",
+                "LIGHT_BLUE_DYE",
+                "BLUE_DYE",
+                "PURPLE_DYE",
+                "MAGENTA_DYE",
+                "PINK_DYE",
+                "GLOW_INK_SAC"
+        ));
+        int[] version = PlotSquared.platform().serverVersion();
+        if (version[1] >= 20 && version[2] >= 1) {
+            mutableDyes.add("HONEYCOMB");
+        }
+        DYES = Set.copyOf(mutableDyes);
+    }
     private final EventDispatcher eventDispatcher;
     private final WorldEdit worldEdit;
     private final PlotAreaManager plotAreaManager;
@@ -207,6 +236,40 @@ public class PlayerEventListener implements Listener {
         this.plotListener = plotListener;
     }
 
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerDyeSign(PlayerInteractEvent event) {
+        ItemStack itemStack = event.getItem();
+        if (itemStack == null) {
+            return;
+        }
+        Block block = event.getClickedBlock();
+        if (block != null && block.getState() instanceof Sign) {
+            if (DYES.contains(itemStack.getType().toString())) {
+                Location location = BukkitUtil.adapt(block.getLocation());
+                PlotArea area = location.getPlotArea();
+                if (area == null) {
+                    return;
+                }
+                Plot plot = location.getOwnedPlot();
+                if (plot == null) {
+                    if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
+                            && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
+                        event.setCancelled(true);
+                    }
+                    return;
+                }
+                if (plot.isAdded(event.getPlayer().getUniqueId())) {
+                    return; // allow for added players
+                }
+                if (!plot.getFlag(EditSignFlag.class)
+                        && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
+                    plot.debug(event.getPlayer().getName() + " could not color the sign because of edit-sign = false");
+                    event.setCancelled(true);
+                }
+            }
+        }
+    }
+
     @EventHandler(ignoreCancelled = true)
     public void onEffect(@NonNull EntityPotionEffectEvent event) {
         if (Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW ||
@@ -608,7 +671,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 +766,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/PlayerEventListener1201.java

@@ -0,0 +1,66 @@
+/*
+ * 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.bukkit.listener;
+
+import com.plotsquared.bukkit.util.BukkitUtil;
+import com.plotsquared.core.location.Location;
+import com.plotsquared.core.permissions.Permission;
+import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.PlotArea;
+import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
+import com.plotsquared.core.util.PlotFlagUtil;
+import org.bukkit.block.Sign;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerSignOpenEvent;
+
+/**
+ * For events since 1.20.1
+ * @since 7.2.1
+ */
+public class PlayerEventListener1201 implements Listener {
+
+    @EventHandler(ignoreCancelled = true)
+    @SuppressWarnings({"removal", "UnstableApiUsage"}) // thanks Paper, thanks Spigot
+    public void onPlayerSignOpenEvent(PlayerSignOpenEvent event) {
+        Sign sign = event.getSign();
+        Location location = BukkitUtil.adapt(sign.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = location.getOwnedPlot();
+        if (plot == null) {
+            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
+                    && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
+                event.setCancelled(true);
+            }
+            return;
+        }
+        if (plot.isAdded(event.getPlayer().getUniqueId())) {
+            return; // allow for added players
+        }
+        if (!plot.getFlag(EditSignFlag.class)
+                && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
+            plot.debug(event.getPlayer().getName() + " could not edit the sign because of edit-sign = false");
+            event.setCancelled(true);
+        }
+    }
+
+}

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);
     }
 
 }

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java

@@ -158,6 +158,7 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         }
         final String[] nodes = stub.split("\\.");
         final StringBuilder n = new StringBuilder();
+        // Wildcard check from less specific permission to more specific permission
         for (int i = 0; i < (nodes.length - 1); i++) {
             n.append(nodes[i]).append(".");
             if (!stub.equals(n + Permission.PERMISSION_STAR.toString())) {
@@ -166,9 +167,11 @@ public class BukkitPlayer extends PlotPlayer<Player> {
                 }
             }
         }
+        // Wildcard check for the full permission
         if (hasPermission(stub + ".*")) {
             return Integer.MAX_VALUE;
         }
+        // Permission value cache for iterative check
         int max = 0;
         if (CHECK_EFFECTIVE) {
             boolean hasAny = false;

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

@@ -47,7 +47,21 @@ public class TranslationUpdateManager {
         String usedGrants = "usedGrants";
         String usedGrantsReplacement = "used_grants";
         String remainingGrants = "remainingGrants";
-        String rremainingGrantsReplacement = "remaining_grants";
+        String remainingGrantsReplacement = "remaining_grants";
+        String minimumRadius = "minimumRadius";
+        String minimumRadiusReplacement = "minimum_radius";
+        String maximumMoves = "maximumMoves";
+        String maximumMovesReplacement = "maximum_moves";
+        String userMove = "userMove";
+        String userMoveReplacement = "user_move";
+
+        // tag opening / closing characters are important, as the locale keys exist as well, which should not be replaced
+        String listInfoUnknown = "<info.unknown>";
+        String listInfoUnknownReplacement = "<unknown>";
+        String listInfoServer = "<info.server>";
+        String listInfoServerReplacement = "<server>";
+        String listInfoEveryone = "<info.everyone>";
+        String listInfoEveryoneReplacement = "<everyone>";
 
         try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
             paths
@@ -58,7 +72,13 @@ public class TranslationUpdateManager {
                         replaceInFile(p, minHeight, minheightReplacement);
                         replaceInFile(p, maxHeight, maxheightReplacement);
                         replaceInFile(p, usedGrants, usedGrantsReplacement);
-                        replaceInFile(p, remainingGrants, rremainingGrantsReplacement);
+                        replaceInFile(p, remainingGrants, remainingGrantsReplacement);
+                        replaceInFile(p, minimumRadius, minimumRadiusReplacement);
+                        replaceInFile(p, maximumMoves, maximumMovesReplacement);
+                        replaceInFile(p, userMove, userMoveReplacement);
+                        replaceInFile(p, listInfoUnknown, listInfoUnknownReplacement);
+                        replaceInFile(p, listInfoServer, listInfoServerReplacement);
+                        replaceInFile(p, listInfoEveryone, listInfoEveryoneReplacement);
                     });
         }
     }

Core/build.gradle.kts

@@ -37,11 +37,6 @@ dependencies {
     // Logging
     compileOnlyApi(libs.log4j)
 
-    // Database
-    api(libs.hikaricp)
-    api(libs.jdbiCore)
-    api(libs.jdbiGuice)
-
     // Other libraries
     api(libs.prtree)
     api(libs.aopalliance)
@@ -76,7 +71,7 @@ tasks {
         opt.links("https://jd.advntr.dev/api/4.14.0/")
         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://checkerframework.org/api/")
         opt.isLinkSource = true
         opt.bottom(File("$rootDir/javadocfooter.html").readText())
         opt.isUse = true

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

@@ -18,7 +18,6 @@
  */
 package com.plotsquared.core;
 
-import com.google.inject.Key;
 import com.plotsquared.core.configuration.ConfigurationSection;
 import com.plotsquared.core.configuration.ConfigurationUtil;
 import com.plotsquared.core.configuration.MemorySection;
@@ -32,12 +31,14 @@ import com.plotsquared.core.configuration.caption.load.DefaultCaptionProvider;
 import com.plotsquared.core.configuration.file.YamlConfiguration;
 import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
 import com.plotsquared.core.database.DBFunc;
+import com.plotsquared.core.database.Database;
+import com.plotsquared.core.database.MySQL;
 import com.plotsquared.core.database.SQLManager;
+import com.plotsquared.core.database.SQLite;
 import com.plotsquared.core.generator.GeneratorWrapper;
 import com.plotsquared.core.generator.HybridPlotWorld;
 import com.plotsquared.core.generator.HybridUtils;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
-import com.plotsquared.core.inject.annotations.PlotDatabase;
 import com.plotsquared.core.inject.factory.HybridPlotWorldFactory;
 import com.plotsquared.core.listener.PlotListener;
 import com.plotsquared.core.location.Location;
@@ -74,9 +75,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import javax.sql.DataSource;
 import java.io.BufferedReader;
-import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -1237,11 +1236,8 @@ public class PlotSquared {
             DBFunc.validatePlots(plots);
 
             // Close the connection
-            final DataSource dataSource = platform().injector().getInstance(Key.get(DataSource.class, PlotDatabase.class));
-            if (dataSource instanceof Closeable closeable) {
-                closeable.close();
-            }
-        } catch (IOException | NullPointerException throwable) {
+            DBFunc.close();
+        } catch (NullPointerException throwable) {
             LOGGER.error("Could not close database connection", throwable);
             throwable.printStackTrace();
         }
@@ -1293,7 +1289,26 @@ public class PlotSquared {
             if (DBFunc.dbManager != null) {
                 DBFunc.dbManager.close();
             }
-            DBFunc.dbManager = platform().injector().getInstance(SQLManager.class);
+            Database database;
+            if (Storage.MySQL.USE) {
+                database = new MySQL(Storage.MySQL.HOST, Storage.MySQL.PORT, Storage.MySQL.DATABASE,
+                        Storage.MySQL.USER, Storage.MySQL.PASSWORD
+                );
+            } else if (Storage.SQLite.USE) {
+                File file = FileUtils.getFile(platform.getDirectory(), Storage.SQLite.DB + ".db");
+                database = new SQLite(file);
+            } else {
+                LOGGER.error("No storage type is set. Disabling PlotSquared");
+                this.platform.shutdown(); //shutdown used instead of disable because no database is set
+                return;
+            }
+            DBFunc.dbManager = new SQLManager(
+                    database,
+                    Storage.PREFIX,
+                    this.eventDispatcher,
+                    this.plotListener,
+                    this.worldConfiguration
+            );
             this.plots_tmp = DBFunc.getPlots();
             if (getPlotAreaManager() instanceof SinglePlotAreaManager) {
                 SinglePlotArea area = ((SinglePlotAreaManager) getPlotAreaManager()).getArea();
@@ -1307,13 +1322,13 @@ public class PlotSquared {
             }
             this.clustersTmp = DBFunc.getClusters();
             LOGGER.info("Connection to database established. Type: {}", Storage.MySQL.USE ? "MySQL" : "SQLite");
-        } catch (Exception e) {
+        } catch (ClassNotFoundException | SQLException e) {
             LOGGER.error(
                     "Failed to open database connection ({}). Disabling PlotSquared",
                     Storage.MySQL.USE ? "MySQL" : "SQLite"
             );
             LOGGER.error("==== Here is an ugly stacktrace, if you are interested in those things ===");
-            LOGGER.error("", e);
+            e.printStackTrace();
             LOGGER.error("==== End of stacktrace ====");
             LOGGER.error(
                     "Please go to the {} 'storage.yml' and configure the database correctly",

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/Condense.java

@@ -256,11 +256,11 @@ public class Condense extends SubCommand {
                 player.sendMessage(TranslatableCaption.of("condense.default_eval"));
                 player.sendMessage(
                         TranslatableCaption.of("condense.minimum_radius"),
-                        TagResolver.resolver("minimumRadius", Tag.inserting(Component.text(minimumRadius)))
+                        TagResolver.resolver("minimum_radius", Tag.inserting(Component.text(minimumRadius)))
                 );
                 player.sendMessage(
                         TranslatableCaption.of("condense.maximum_moved"),
-                        TagResolver.resolver("maxMove", Tag.inserting(Component.text(maxMove)))
+                        TagResolver.resolver("maximum_moves", Tag.inserting(Component.text(maxMove)))
                 );
                 player.sendMessage(TranslatableCaption.of("condense.input_eval"));
                 player.sendMessage(
@@ -269,7 +269,7 @@ public class Condense extends SubCommand {
                 );
                 player.sendMessage(
                         TranslatableCaption.of("condense.estimated_moves"),
-                        TagResolver.resolver("userMove", Tag.inserting(Component.text(userMove)))
+                        TagResolver.resolver("user_move", Tag.inserting(Component.text(userMove)))
                 );
                 player.sendMessage(TranslatableCaption.of("condense.eta"));
                 player.sendMessage(TranslatableCaption.of("condense.radius_measured"));

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

@@ -94,7 +94,7 @@ public class Done extends SubCommand {
                 TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
         );
         final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
-        if (PlotSquared.platform().expireManager() == null || doneRequirements == null) {
+        if (PlotSquared.platform().expireManager() == null || doneRequirements == null || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DONE)) {
             finish(plot, player, true);
             plot.removeRunning();
         } else {

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

@@ -136,7 +136,9 @@ public class Download extends SubCommand {
                     }
                     player.sendMessage(
                             TranslatableCaption.of("web.generation_link_success_legacy_world"),
-                            TagResolver.resolver("url", Tag.inserting(Component.text(url.toString())))
+                            TagResolver.builder()
+                                    .tag("url", Tag.preProcessParsed(url.toString()))
+                                    .build()
                     );
                 }
             });

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

@@ -103,9 +103,10 @@ public final class FlagCommand extends Command {
         if (flag instanceof IntegerFlag && MathMan.isInteger(value)) {
             try {
                 int numeric = Integer.parseInt(value);
+                // Getting full permission without ".<amount>" at the end
                 perm = perm.substring(0, perm.length() - value.length() - 1);
                 boolean result = false;
-                if (numeric > 0) {
+                if (numeric >= 0) {
                     int checkRange = PlotSquared.get().getPlatform().equalsIgnoreCase("bukkit") ?
                             numeric :
                             Settings.Limit.MAX_PLOTS;

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

@@ -465,7 +465,7 @@ public class ListCmd extends SubCommand {
                 TextComponent.Builder builder = Component.text();
                 if (plot.getFlag(ServerPlotFlag.class)) {
                     TagResolver serverResolver = TagResolver.resolver(
-                            "info.server",
+                            "server",
                             Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
                     );
                     builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
@@ -483,13 +483,13 @@ public class ListCmd extends SubCommand {
                                 builder.append(MINI_MESSAGE.deserialize(online, resolver));
                             } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
                                 TagResolver unknownResolver = TagResolver.resolver(
-                                        "info.unknown",
+                                        "unknown",
                                         Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
                                 );
                                 builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
                             } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
                                 TagResolver everyoneResolver = TagResolver.resolver(
-                                        "info.everyone",
+                                        "everyone",
                                         Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
                                 );
                                 builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));

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

@@ -100,15 +100,17 @@ public class Remove extends SubCommand {
                             count++;
                         }
                     } else if (uuid == DBFunc.EVERYONE) {
+                        count += plot.getTrusted().size();
                         if (plot.removeTrusted(uuid)) {
                             this.eventDispatcher.callTrusted(player, plot, uuid, false);
-                            count++;
-                        } else if (plot.removeMember(uuid)) {
+                        }
+                        count += plot.getMembers().size();
+                        if (plot.removeMember(uuid)) {
                             this.eventDispatcher.callMember(player, plot, uuid, false);
-                            count++;
-                        } else if (plot.removeDenied(uuid)) {
+                        }
+                        count += plot.getDenied().size();
+                        if (plot.removeDenied(uuid)) {
                             this.eventDispatcher.callDenied(player, plot, uuid, false);
-                            count++;
                         }
                     }
                 }

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

@@ -522,7 +522,7 @@ public class Settings extends Config {
         @Comment("Should the limit be global (over multiple worlds)")
         public static boolean GLOBAL =
                 false;
-        @Comment({"The max range of permissions to check for, e.g. plots.plot.127",
+        @Comment({"The max range of integer permissions to check for, e.g. 'plots.plot.127' or 'plots.set.flag.mob-cap.127'",
                 "The value covers the permission range to check, you need to assign the permission to players/groups still",
                 "Modifying the value does NOT change the amount of plots players can claim"})
         public static int MAX_PLOTS = 127;

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

@@ -29,7 +29,6 @@ import java.sql.Statement;
  * @author -_Husky_-
  * @author tips48
  */
-@Deprecated(forRemoval = true)
 public abstract class Database {
 
     public abstract Connection forceConnection() throws SQLException, ClassNotFoundException;

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

@@ -33,7 +33,6 @@ import java.sql.Statement;
  * @author -_Husky_-
  * @author tips48
  */
-@Deprecated(forRemoval = true)
 public class MySQL extends Database {
 
     private final String user;

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

@@ -33,7 +33,6 @@ import java.sql.Statement;
 /**
  * Connects to and uses a SQLite database.
  */
-@Deprecated(forRemoval = true)
 public class SQLite extends Database {
 
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SQLite.class.getSimpleName());

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

@@ -0,0 +1,77 @@
+/*
+ * 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.events;
+
+import com.plotsquared.core.player.PlotPlayer;
+import org.checkerframework.checker.index.qual.NonNegative;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+/**
+ * Called every time after PlotSquared calculated a players plot limit based on their permission.
+ * <p>
+ * May be used to grant a player more plots based on another rank or bought feature.
+ *
+ * @since 7.3.0
+ */
+public class PlayerPlotLimitEvent {
+
+    private final PlotPlayer<?> player;
+
+    private int limit;
+
+    public PlayerPlotLimitEvent(@NonNull final PlotPlayer<?> player, @NonNegative final int limit) {
+        this.player = player;
+        this.limit = limit;
+    }
+
+    /**
+     * Overrides the previously calculated or set plot limit for {@link #player()}.
+     *
+     * @param limit The amount of plots a player may claim. Must be {@code 0} or greater.
+     * @since 7.3.0
+     */
+    public void limit(@NonNegative final int limit) {
+        if (limit < 0) {
+            throw new IllegalArgumentException("Player plot limit must be greater or equal 0");
+        }
+        this.limit = limit;
+    }
+
+    /**
+     * Returns the previous set limit, if none was overridden before this event handler the default limit based on the players
+     * permissions node is returned.
+     *
+     * @return The currently defined plot limit of this player.
+     * @since 7.3.0
+     */
+    public @NonNegative int limit() {
+        return limit;
+    }
+
+    /**
+     * The player for which the limit is queried.
+     *
+     * @return the player.
+     * @since 7.3.0
+     */
+    public @NonNull PlotPlayer<?> player() {
+        return player;
+    }
+
+}

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

@@ -21,21 +21,26 @@ 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   Start location
+     * @param from   The origin location, from where the teleport was triggered (players location most likely)
      * @param plot   Plot to which the player was teleported
      * @param cause  Why the teleport is being completed
      * @since 6.1.0
@@ -57,7 +62,8 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
     }
 
     /**
-     * Get the from location
+     * Get the location, from where the teleport was triggered
+     * (the players current location when executing the home command for example)
      *
      * @return Location
      */
@@ -65,6 +71,27 @@ 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 7.2.1
+     */
+    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 7.2.1
+     */
+    public void setLocationTransformer(@Nullable UnaryOperator<Location> locationTransformer) {
+        this.locationTransformer = locationTransformer;
+    }
+
     @Override
     public Result getEventResult() {
         return eventResult;

Core/src/main/java/com/plotsquared/core/inject/annotations/PlotDatabase.java

@@ -1,12 +0,0 @@
-package com.plotsquared.core.inject.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PlotDatabase {
-
-}

Core/src/main/java/com/plotsquared/core/inject/modules/DatabaseModule.java

@@ -1,72 +0,0 @@
-package com.plotsquared.core.inject.modules;
-
-import com.google.inject.AbstractModule;
-import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.configuration.Storage;
-import com.plotsquared.core.inject.annotations.PlotDatabase;
-import com.plotsquared.core.util.FileUtils;
-import com.plotsquared.core.util.StringMan;
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import javax.sql.DataSource;
-import java.io.File;
-
-public class DatabaseModule extends AbstractModule {
-
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotSquared.class.getSimpleName());
-
-    @Override
-    protected void configure() {
-        try {
-            if (Storage.MySQL.USE) {
-                this.configureMySQL();
-            } else if (Storage.SQLite.USE) {
-                this.configureSQLite();
-            } else {
-                LOGGER.error("No storage type is set. Disabling PlotSquared");
-                PlotSquared.platform().shutdown();
-            }
-        } catch (final Exception e) {
-            LOGGER.error("Unable to initialize database", e);
-            PlotSquared.platform().shutdown();
-        }
-    }
-
-    private void configureSQLite() throws Exception {
-        final File file = FileUtils.getFile(PlotSquared.platform().getDirectory(), Storage.SQLite.DB + ".db");
-        if (!file.exists()) {
-            file.createNewFile();
-        }
-        Class.forName("org.sqlite.JDBC");
-
-        final HikariConfig config = new HikariConfig();
-        config.setJdbcUrl("jdbc:sqlite:" + file);
-        config.setDriverClassName("org.sqlite.JDBC");
-        final DataSource dataSource = new HikariDataSource();
-
-        binder().bind(DataSource.class).annotatedWith(PlotDatabase.class).toInstance(dataSource);
-    }
-
-    private void configureMySQL() {
-        final HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(
-                String.format(
-                        "jdbc:mysql://%s:%s/%s?%s",
-                        Storage.MySQL.HOST,
-                        Storage.MySQL.PORT,
-                        Storage.MySQL.DATABASE,
-                        StringMan.join(Storage.MySQL.PROPERTIES, "&")
-                ));
-        hikariConfig.setUsername(Storage.MySQL.USER);
-        hikariConfig.setPassword(Storage.MySQL.PASSWORD);
-        hikariConfig.addDataSourceProperty("cachePrepStmts", "true");
-        hikariConfig.addDataSourceProperty("prepStmtCacheSize", "512");
-        hikariConfig.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
-        final DataSource dataSource = new HikariDataSource(hikariConfig);
-
-        binder().bind(DataSource.class).annotatedWith(PlotDatabase.class).toInstance(dataSource);
-    }
-}

Core/src/main/java/com/plotsquared/core/inject/modules/JdbiModule.java

@@ -1,15 +0,0 @@
-package com.plotsquared.core.inject.modules;
-
-import com.plotsquared.core.inject.annotations.PlotDatabase;
-import org.jdbi.v3.guice.AbstractJdbiDefinitionModule;
-
-public class JdbiModule extends AbstractJdbiDefinitionModule {
-
-    public JdbiModule() {
-        super(PlotDatabase.class);
-    }
-    @Override
-    public void configureJdbi() {
-
-    }
-}

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

@@ -364,7 +364,6 @@ public class PlotListener {
     public boolean plotExit(final PlotPlayer<?> player, Plot plot) {
         try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             final Plot previous = lastPlot.remove();
-            this.eventDispatcher.callLeave(player, plot);
 
             List<StatusEffect> effects = playerEffects.remove(player.getUUID());
             if (effects != null) {
@@ -467,6 +466,8 @@ public class PlotListener {
                 feedRunnable.remove(player.getUUID());
                 healRunnable.remove(player.getUUID());
             }
+        } finally {
+            this.eventDispatcher.callLeave(player, plot);
         }
         return true;
     }

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/permissions/Permission.java

@@ -59,6 +59,9 @@ public enum Permission implements ComponentLike {
     PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED("plots.admin.vehicle.break.unowned"),
     PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER("plots.admin.vehicle.break.other"),
     PERMISSION_ADMIN_PVE("plots.admin.pve"),
+    PERMISSION_ADMIN_PLACE_VEHICLE_ROAD("plots.admin.vehicle.place.road"),
+    PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED("plots.admin.vehicle.place.unowned"),
+    PERMISSION_ADMIN_PLACE_VEHICLE_OTHER("plots.admin.vehicle.place.other"),
     PERMISSION_ADMIN_PVP("plots.admin.pvp"),
     PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road"),
     PERMISSION_ADMIN_PROJECTILE_ROAD("plots.admin.projectile.road"),

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

@@ -100,6 +100,7 @@ public interface PermissionHolder {
         }
         String[] nodes = stub.split("\\.");
         StringBuilder builder = new StringBuilder();
+        // Wildcard check from less specific permission to more specific permission
         for (int i = 0; i < (nodes.length - 1); i++) {
             builder.append(nodes[i]).append(".");
             if (!stub.equals(builder + Permission.PERMISSION_STAR.toString())) {
@@ -108,6 +109,7 @@ public interface PermissionHolder {
                 }
             }
         }
+        // Wildcard check for the full permission
         if (hasPermission(stub + ".*")) {
             return Integer.MAX_VALUE;
         }

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

@@ -306,7 +306,8 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      * @return number of allowed plots within the scope (globally, or in the player's current world as defined in the settings.yml)
      */
     public int getAllowedPlots() {
-        return hasPermissionRange("plots.plot", Settings.Limit.MAX_PLOTS);
+        final int calculatedLimit = hasPermissionRange("plots.plot", Settings.Limit.MAX_PLOTS);
+        return this.eventDispatcher.callPlayerPlotLimit(this, calculatedLimit).limit();
     }
 
     /**

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

@@ -29,6 +29,7 @@ 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;
@@ -85,6 +86,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;
@@ -2283,8 +2285,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
      */
@@ -2295,117 +2297,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>
@@ -2614,8 +2574,9 @@ public class Plot {
      */
     public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) {
         Plot plot = this.getBasePlot(false);
-        Result result = this.eventDispatcher.callTeleport(player, player.getLocation(), plot, cause).getEventResult();
-        if (result == Result.DENY) {
+
+        PlayerTeleportToPlotEvent event = this.eventDispatcher.callTeleport(player, player.getLocation(), plot, cause);
+        if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
                     TranslatableCaption.of("events.event_denied"),
                     TagResolver.resolver("value", Tag.inserting(Component.text("Teleport")))
@@ -2623,7 +2584,10 @@ public class Plot {
             resultConsumer.accept(false);
             return;
         }
-        final Consumer<Location> locationConsumer = location -> {
+
+        final Consumer<Location> locationConsumer = calculatedLocation -> {
+            Location location = event.getLocationTransformer() == null ? calculatedLocation :
+                    Objects.requireNonNullElse(event.getLocationTransformer().apply(calculatedLocation), calculatedLocation);
             if (Settings.Teleport.DELAY == 0 || player.hasPermission("plots.teleport.delay.bypass")) {
                 player.sendMessage(TranslatableCaption.of("teleport.teleported_to_plot"));
                 player.teleport(location, cause);
@@ -2679,6 +2643,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);
@@ -2692,7 +2661,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

@@ -147,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;
@@ -356,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");
@@ -489,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",
@@ -937,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) {
@@ -951,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).
      */
@@ -1210,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/flag/GlobalFlagContainer.java

@@ -42,6 +42,7 @@ import com.plotsquared.core.plot.flag.implementations.DeviceInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag;
+import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
 import com.plotsquared.core.plot.flag.implementations.EntityCapFlag;
 import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
 import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
@@ -88,6 +89,7 @@ import com.plotsquared.core.plot.flag.implementations.PlayerInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
 import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag;
 import com.plotsquared.core.plot.flag.implementations.PriceFlag;
+import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.flag.implementations.PveFlag;
 import com.plotsquared.core.plot.flag.implementations.PvpFlag;
@@ -153,6 +155,7 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(DeviceInteractFlag.DEVICE_INTERACT_FALSE);
         this.addFlag(DisablePhysicsFlag.DISABLE_PHYSICS_FALSE);
         this.addFlag(DropProtectionFlag.DROP_PROTECTION_FALSE);
+        this.addFlag(EditSignFlag.EDIT_SIGN_FALSE);
         this.addFlag(EntityChangeBlockFlag.ENTITY_CHANGE_BLOCK_FALSE);
         this.addFlag(ExplosionFlag.EXPLOSION_FALSE);
         this.addFlag(ForcefieldFlag.FORCEFIELD_FALSE);
@@ -183,6 +186,7 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(NoWorldeditFlag.NO_WORLDEDIT_FALSE);
         this.addFlag(PlayerInteractFlag.PLAYER_INTERACT_FALSE);
         this.addFlag(PreventCreativeCopyFlag.PREVENT_CREATIVE_COPY_FALSE);
+        this.addFlag(ProjectileChangeBlockFlag.PROJECTILE_CHANGE_BLOCK_FALSE);
         this.addFlag(PveFlag.PVE_FALSE);
         this.addFlag(PvpFlag.PVP_FALSE);
         this.addFlag(RedstoneFlag.REDSTONE_TRUE);

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

@@ -0,0 +1,41 @@
+/*
+ * 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;
+
+/**
+ * @since 7.2.1
+ */
+public class EditSignFlag extends BooleanFlag<EditSignFlag> {
+    public static final EditSignFlag EDIT_SIGN_TRUE = new EditSignFlag(true);
+    public static final EditSignFlag EDIT_SIGN_FALSE = new EditSignFlag(false);
+
+    private EditSignFlag(final boolean value) {
+        super(value, TranslatableCaption.of("flags.flag_description_edit_sign"));
+    }
+
+    @Override
+    protected EditSignFlag flagOf(@NonNull final Boolean value) {
+        return value ? EDIT_SIGN_TRUE : EDIT_SIGN_FALSE;
+    }
+
+}

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ProjectileChangeBlockFlag.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 ProjectileChangeBlockFlag extends BooleanFlag<ProjectileChangeBlockFlag> {
+
+    public static final ProjectileChangeBlockFlag PROJECTILE_CHANGE_BLOCK_TRUE = new ProjectileChangeBlockFlag(true);
+    public static final ProjectileChangeBlockFlag PROJECTILE_CHANGE_BLOCK_FALSE = new ProjectileChangeBlockFlag(false);
+
+    private ProjectileChangeBlockFlag(boolean value) {
+        super(value, TranslatableCaption.of("flags.flag_description_projectile_change_block"));
+    }
+
+    @Override
+    protected ProjectileChangeBlockFlag flagOf(@NonNull Boolean value) {
+        return value ? PROJECTILE_CHANGE_BLOCK_TRUE : PROJECTILE_CHANGE_BLOCK_FALSE;
+    }
+
+}

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

@@ -30,6 +30,7 @@ import com.plotsquared.core.events.PlayerEnterPlotEvent;
 import com.plotsquared.core.events.PlayerLeavePlotEvent;
 import com.plotsquared.core.events.PlayerPlotDeniedEvent;
 import com.plotsquared.core.events.PlayerPlotHelperEvent;
+import com.plotsquared.core.events.PlayerPlotLimitEvent;
 import com.plotsquared.core.events.PlayerPlotTrustedEvent;
 import com.plotsquared.core.events.PlayerTeleportToPlotEvent;
 import com.plotsquared.core.events.PlotAutoMergeEvent;
@@ -63,6 +64,7 @@ import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.plot.Rating;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.plot.flag.implementations.DeviceInteractFlag;
+import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscPlaceFlag;
 import com.plotsquared.core.plot.flag.implementations.MobPlaceFlag;
 import com.plotsquared.core.plot.flag.implementations.PlaceFlag;
@@ -74,6 +76,7 @@ import com.plotsquared.core.util.task.TaskManager;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.world.block.BlockCategories;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import net.kyori.adventure.text.Component;
@@ -306,6 +309,12 @@ public class EventDispatcher {
         return event;
     }
 
+    public PlayerPlotLimitEvent callPlayerPlotLimit(PlotPlayer<?> player, int calculatedLimit) {
+        PlayerPlotLimitEvent event = new PlayerPlotLimitEvent(player, calculatedLimit);
+        eventBus.post(event);
+        return event;
+    }
+
     public void doJoinTask(final PlotPlayer<?> player) {
         if (player == null) {
             return; //possible future warning message to figure out where we are retrieving null
@@ -373,14 +382,10 @@ public class EventDispatcher {
                             return true;
                         }
                     }
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
-                    );
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
-                    );
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
                 }
                 final List<BlockTypeWrapper> use = plot.getFlag(UseFlag.class);
                 for (final BlockTypeWrapper blockTypeWrapper : use) {
@@ -389,7 +394,13 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), false)) {
+                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
+                    return true;
+                }
+                // we check for the EditSignFlag in the PlayerSignOpenEvent again, but we must not cancel the interact event
+                // or send a message if the flag is true
+                if (BlockCategories.ALL_SIGNS != null && BlockCategories.ALL_SIGNS.contains(blockType)
+                        && plot.getFlag(EditSignFlag.class)) {
                     return true;
                 }
                 if (notifyPerms) {
@@ -408,14 +419,10 @@ public class EventDispatcher {
                             return true;
                         }
                     }
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), false
-                    );
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, false);
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), false
-                    );
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, false);
                 }
                 if (plot.getFlag(DeviceInteractFlag.class)) {
                     return true;
@@ -427,21 +434,14 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                return player.hasPermission(
-                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
-                        false
-                );
+                return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false);
             }
             case SPAWN_MOB -> {
                 if (plot == null) {
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
-                    );
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
-                    );
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
                 }
                 if (plot.getFlag(MobPlaceFlag.class)) {
                     return true;
@@ -453,10 +453,7 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                if (player.hasPermission(
-                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
-                        false
-                )) {
+                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
                     return true;
                 }
                 if (notifyPerms) {
@@ -476,14 +473,10 @@ public class EventDispatcher {
             }
             case PLACE_MISC -> {
                 if (plot == null) {
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
-                    );
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
-                    );
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
                 }
                 if (plot.getFlag(MiscPlaceFlag.class)) {
                     return true;
@@ -495,10 +488,7 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                if (player.hasPermission(
-                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
-                        false
-                )) {
+                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
                     return true;
                 }
                 if (notifyPerms) {
@@ -518,16 +508,28 @@ public class EventDispatcher {
             }
             case PLACE_VEHICLE -> {
                 if (plot == null) {
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
-                    );
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_ROAD, notifyPerms);
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(
-                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
+                    return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED, notifyPerms);
+                }
+                if (plot.getFlag(VehiclePlaceFlag.class)) {
+                    return true;
+                }
+                if (player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_OTHER, false)) {
+                    return true;
+                }
+                if (notifyPerms) {
+                    player.sendMessage(
+                            TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
+                            TagResolver.resolver(
+                                    "flag",
+                                    Tag.inserting(
+                                            PlotFlag.getFlagNameComponent(VehiclePlaceFlag.class)
+                                    )
+                            )
                     );
                 }
-                return plot.getFlag(VehiclePlaceFlag.class);
             }
             default -> {
             }

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/query/HasOwnerFilter.java

@@ -0,0 +1,31 @@
+/*
+ * 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.util.query;
+
+import com.plotsquared.core.plot.Plot;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+class HasOwnerFilter implements PlotFilter {
+
+    @Override
+    public boolean accepts(final @NonNull Plot plot) {
+        return plot.hasOwner();
+    }
+
+}

Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java

@@ -219,6 +219,16 @@ public final class PlotQuery implements Iterable<Plot> {
         return this.addFilter(new OwnersIncludeFilter(owner.getUUID()));
     }
 
+    /**
+     * Query only for plots that have an owner
+     *
+     * @return The query instance
+     * @since 7.2.1
+     */
+
+    public @NonNull PlotQuery hasOwner() {
+        return this.addFilter(new HasOwnerFilter());
+    }
     /**
      * Query for plots with a specific alias
      *

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

@@ -248,11 +248,11 @@
   "condense.skipping": "<prefix><red>Skipping complex plot: </red><gold><plot></gold><red>.</red>",
   "condense.task_stopped": "<prefix><gold>Task already stopped.</gold>",
   "condense.default_eval": "<dark_gray><strikethrough>=== <reset> <gold>DEFAULT EVAL </gold><dark_gray><strikethrough>===</dark_gray>",
-  "condense.minimum_radius": "<gold>Minimum radius: </gold><gray><minimumRadius></gray>",
-  "condense.maximum_moved": "<gold>Maximum moved: </gold><gray><maximumMoves></gray>",
+  "condense.minimum_radius": "<gold>Minimum radius: </gold><gray><minimum_radius></gray>",
+  "condense.maximum_moved": "<gold>Maximum moved: </gold><gray><maximum_moves></gray>",
   "condense.input_eval": "<dark_gray><strikethrough>=== <reset> <gold>INPUT EVAL </gold><dark_gray><strikethrough>===</dark_gray>",
   "condense.input_radius": "<gold>Input radius: </gold><gray><radius></gray>",
-  "condense.estimated_moves": "<gold>Estimated moves: </gold><gray><userMove></gray>",
+  "condense.estimated_moves": "<gold>Estimated moves: </gold><gray><user_move></gray>",
   "condense.eta": "<prefix><gold>Estimated time: No idea, times will drastically change based on the system performance and load.</gold>",
   "condense.radius_measured": "<yellow> - Radius is measured in plot width.</yellow>",
   "database.starting_conversion": "<prefix><gold>Starting...</gold>",
@@ -381,9 +381,9 @@
   "info.plot_list_default": "<gold><plot></gold>",
   "info.plot_list_player_online": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_aqua>Online</dark_aqua>'><gold><player></gold></hover>",
   "info.plot_list_player_offline": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_gray>Offline</dark_gray>'><gold><player></gold></hover>",
-  "info.plot_list_player_unknown": "<hover:show_text:'<red>The owner of this plot is unknown</red>'><white><info.unknown></white></hover>",
-  "info.plot_list_player_server": "<hover:show_text:'<red>The plot is owned by the server</red>'><white><info.server></white></hover>",
-  "info.plot_list_player_everyone": "<hover:show_text:'<blue>The plot is owned by everyone</blue>'><white><info.everyone></white></hover>",
+  "info.plot_list_player_unknown": "<hover:show_text:'<red>The owner of this plot is unknown</red>'><white><unknown></white></hover>",
+  "info.plot_list_player_server": "<hover:show_text:'<red>The plot is owned by the server</red>'><white><server></white></hover>",
+  "info.plot_list_player_everyone": "<hover:show_text:'<blue>The plot is owned by everyone</blue>'><white><everyone></white></hover>",
   "info.area_info_format": "<header>\n<reset><gold>Name: </gold><gray><name></gray>\n<gold>Type: </gold><gray><type></gray>\n<gold>Terrain: </gold><gray><terrain></gray>\n<gold>Usage: </gold><gray><usage>%</gray>\n<gold>Claimed: </gold><gray><claimed></gray>\n<gold>Clusters: </gold><gray><clusters></gray>\n<gold>Region: </gold><gray><region></gray>\n<gold>Generator: </gold><gray><generator></gray>\n<footer>",
   "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
   "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
@@ -555,6 +555,7 @@
   "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>",
+  "flags.flag_description_edit_sign": "<gray>Set to `true` to allow editing signs in the plot.</gray>",
   "flags.flag_description_feed": "<gray>Specify an interval in seconds and an optional amount by which the players will be fed (amount is 1 by default).</gray>",
   "flags.flag_description_forcefield": "<gray>Set to `true` to enable member forcefield in the plot.</gray>",
   "flags.flag_description_grass_grow": "<gray>Set to `false` to prevent grass from growing within the plot.</gray>",
@@ -588,6 +589,7 @@
   "flags.flag_description_place": "<gray>Define a list of materials players should be able to place in the plot.</gray>",
   "flags.flag_description_player_interact": "<gray>Set to `true` to allow guests to interact with players in the plot.</gray>",
   "flags.flag_description_price": "<gray>Set a price for a plot. Must be a positive decimal number.</gray>",
+  "flags.flag_description_projectile_change_block": "<gray>Set to `true` to allow projectiles to change blocks (tnt, etc.) on the plot.</gray>",
   "flags.flag_description_pve": "<gray>Set to `true` to enable PVE inside the plot.</gray>",
   "flags.flag_description_pvp": "<gray>Set to `true` to enable PVP inside the plot.</gray>",
   "flags.flag_description_redstone": "<gray>Set to `false` to disable redstone in the plot.</gray>",

build.gradle.kts

@@ -1,8 +1,8 @@
 import com.diffplug.gradle.spotless.SpotlessPlugin
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
 import groovy.json.JsonSlurper
-import java.net.URI
 import xyz.jpenilla.runpaper.task.RunServer
+import java.net.URI
 
 plugins {
     java
@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.1.1-SNAPSHOT"
+version = "7.3.2-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -79,7 +79,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.1")
     }
 
     plugins.withId("java") {
@@ -224,7 +225,7 @@ tasks.getByName<Jar>("jar") {
     enabled = false
 }
 
-val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.2")
+val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.4")
 tasks {
     register("cacheLatestFaweArtifact") {
         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()

gradle/libs.versions.toml

@@ -2,27 +2,23 @@
 # Platform expectations
 paper = "1.20.2-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.7.3"
-checkerqual = "3.39.0"
+spotbugs = "4.8.3"
+checkerqual = "3.42.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.14.0"
-adventure-bukkit = "4.3.1"
+adventure = "4.15.0"
+adventure-bukkit = "4.3.2"
 log4j = "2.19.0"
 
 # Plugins
-worldedit = "7.2.16"
-fawe = "2.8.0"
-placeholderapi = "2.11.4"
+worldedit = "7.2.18"
+fawe = "2.8.3"
+placeholderapi = "2.11.5"
 luckperms = "5.4"
 essentialsx = "2.20.1"
 mvdwapi = "3.1.1"
 
-# Datebase
-hikaricp = "5.0.1"
-jdbi = "3.41.3"
-
 # Third party
 prtree = "2.0.1"
 aopalliance = "1.0"
@@ -39,9 +35,9 @@ serverlib = "2.3.4"
 # Gradle plugins
 shadow = "8.1.1"
 grgit = "4.1.1"
-spotless = "6.22.0"
+spotless = "6.23.3"
 nexus = "1.3.0"
-runPaper = "2.2.0"
+runPaper = "2.2.2"
 
 [libraries]
 # Platform expectations
@@ -67,11 +63,6 @@ essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "
 faweCore = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Core", version.ref = "fawe" }
 faweBukkit = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Bukkit", version.ref = "fawe" }
 
-# Database
-hikaricp = { group = "com.zaxxer", name = "HikariCP", version.ref = "hikaricp" }
-jdbiCore = { group = "org.jdbi", name = "jdbi3-core", version.ref = "jdbi" }
-jdbiGuice = { group = "org.jdbi", name = "jdbi3-guice", version.ref = "jdbi" }
-
 # Third party
 prtree = { group = "com.intellectualsites.prtree", name = "PRTree", version.ref = "prtree" }
 aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopalliance" }

gradle/wrapper/gradle-wrapper.properties

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