feature: connection pooling & SQL refactoring

.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@v4
+        uses: actions/setup-java@v3
         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@v4
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17

.github/workflows/codeql.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17

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

@@ -1,23 +0,0 @@
-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

@@ -89,6 +89,8 @@ 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()

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

@@ -37,7 +37,6 @@ 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;
@@ -83,6 +82,8 @@ 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;
@@ -136,12 +137,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;
@@ -294,7 +295,9 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                         new WorldManagerModule(),
                         new PlotSquaredModule(),
                         new BukkitModule(this),
-                        new BackupModule()
+                        new BackupModule(),
+                        new JdbiModule(),
+                        new DatabaseModule()
                 );
         this.injector.injectMembers(this);
 
@@ -360,9 +363,6 @@ 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,7 +818,6 @@ 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());
@@ -1184,17 +1183,6 @@ 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,9 +47,6 @@ 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;
@@ -75,8 +72,6 @@ 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());
@@ -133,64 +128,21 @@ public class BukkitModule extends AbstractModule {
     @Provides
     @Singleton
     @NonNull EconHandler provideEconHandler() {
-        if (!Settings.Enabled_Components.ECONOMY || !Bukkit.getPluginManager().isPluginEnabled("Vault")) {
+        if (!Settings.Enabled_Components.ECONOMY) {
             return EconHandler.nullEconHandler();
         }
-        // Guice eagerly initializes singletons, so we need to bring the laziness ourselves
+        if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-        return new LazyEconHandler();
+            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;
-    private static final class LazyEconHandler extends EconHandler implements ServerListener.MutableEconHandler {
+            } catch (final Exception ignored) {
-        private volatile EconHandler implementation;
-
-        public void setImplementation(EconHandler econHandler) {
-            this.implementation = econHandler;
             }
-
-        @Override
-        public boolean init() {
-            return get().init();
         }
-
+        return EconHandler.nullEconHandler();
-        @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/EntityEventListener.java

@@ -143,10 +143,6 @@ 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" -> {
@@ -157,7 +153,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", "DEFAULT" -> {
+                    "DUPLICATION", "FROZEN", "SPELL" -> {
                 if (!area.isMobSpawning()) {
                     event.setCancelled(true);
                     return;
@@ -170,7 +166,7 @@ public class EntityEventListener implements Listener {
                 }
             }
             case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
-                if (!area.isSpawnCustom()) {
+                if (!area.isSpawnCustom() && entity.getType() != EntityType.ARMOR_STAND) {
                     event.setCancelled(true);
                     return;
                 }

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.getTargetBlockExact(4);
+        Block b = slime.getTargetBlock(4);
         if (b == null) {
             return;
         }
@@ -166,16 +166,12 @@ public class PaperListener implements Listener {
         }
         Location location = BukkitUtil.adapt(event.getSpawnLocation());
         PlotArea area = location.getPlotArea();
-        if (area == null) {
+        if (!location.isPlotArea()) {
-            return;
-        }
-        // 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;
@@ -204,7 +200,7 @@ public class PaperListener implements Listener {
                 }
             }
             case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
-                if (!area.isSpawnCustom()) {
+                if (!area.isSpawnCustom() && event.getType() != EntityType.ARMOR_STAND) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;

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

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

@@ -1,63 +0,0 @@
-/*
- * 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.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 TODO
- */
-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.setCancelled(true);
-            }
-            return;
-        }
-        if (plot.isAdded(event.getPlayer().getUniqueId())) {
-            return; // allow for added players
-        }
-        if (!plot.getFlag(EditSignFlag.class)) {
-            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,14 +21,9 @@ 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;
@@ -37,8 +32,6 @@ 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
@@ -52,29 +45,6 @@ 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,7 +158,6 @@ 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())) {
@@ -167,11 +166,9 @@ 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;

Core/build.gradle.kts

@@ -37,6 +37,11 @@ dependencies {
     // Logging
     compileOnlyApi(libs.log4j)
 
+    // Database
+    api(libs.hikaricp)
+    api(libs.jdbiCore)
+    api(libs.jdbiGuice)
+
     // Other libraries
     api(libs.prtree)
     api(libs.aopalliance)

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

@@ -18,6 +18,7 @@
  */
 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;
@@ -31,14 +32,12 @@ 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;
@@ -75,7 +74,9 @@ 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;
@@ -1236,8 +1237,11 @@ public class PlotSquared {
             DBFunc.validatePlots(plots);
 
             // Close the connection
-            DBFunc.close();
+            final DataSource dataSource = platform().injector().getInstance(Key.get(DataSource.class, PlotDatabase.class));
-        } catch (NullPointerException throwable) {
+            if (dataSource instanceof Closeable closeable) {
+                closeable.close();
+            }
+        } catch (IOException | NullPointerException throwable) {
             LOGGER.error("Could not close database connection", throwable);
             throwable.printStackTrace();
         }
@@ -1289,26 +1293,7 @@ public class PlotSquared {
             if (DBFunc.dbManager != null) {
                 DBFunc.dbManager.close();
             }
-            Database database;
+            DBFunc.dbManager = platform().injector().getInstance(SQLManager.class);
-            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();
@@ -1322,13 +1307,13 @@ public class PlotSquared {
             }
             this.clustersTmp = DBFunc.getClusters();
             LOGGER.info("Connection to database established. Type: {}", Storage.MySQL.USE ? "MySQL" : "SQLite");
-        } catch (ClassNotFoundException | SQLException e) {
+        } catch (Exception 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 ===");
-            e.printStackTrace();
+            LOGGER.error("", e);
             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(false);
+            int border = area.getBorder();
             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/Download.java

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

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

@@ -103,10 +103,9 @@ 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/Remove.java

@@ -100,17 +100,15 @@ 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++;
-                        count += plot.getMembers().size();
+                        } else if (plot.removeMember(uuid)) {
-                        if (plot.removeMember(uuid)) {
                             this.eventDispatcher.callMember(player, plot, uuid, false);
-                        }
+                            count++;
-                        count += plot.getDenied().size();
+                        } else if (plot.removeDenied(uuid)) {
-                        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 integer permissions to check for, e.g. 'plots.plot.127' or 'plots.set.flag.mob-cap.127'",
+        @Comment({"The max range of permissions to check for, e.g. plots.plot.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,6 +29,7 @@ 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,6 +33,7 @@ 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/SQLManager.java

@@ -25,6 +25,7 @@ import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.Storage;
 import com.plotsquared.core.configuration.caption.CaptionUtility;
 import com.plotsquared.core.configuration.file.YamlConfiguration;
+import com.plotsquared.core.inject.annotations.PlotDatabase;
 import com.plotsquared.core.inject.annotations.WorldConfig;
 import com.plotsquared.core.listener.PlotListener;
 import com.plotsquared.core.location.BlockLoc;
@@ -44,10 +45,14 @@ import com.plotsquared.core.util.HashUtil;
 import com.plotsquared.core.util.StringMan;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.TaskManager;
+import jakarta.inject.Inject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
+import javax.sql.DataSource;
+import java.io.Closeable;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
@@ -92,12 +97,12 @@ public class SQLManager implements AbstractDB {
 
     // Private Final
     private final String prefix;
-    private final Database database;
     private final boolean mySQL;
     @SuppressWarnings({"unused", "FieldCanBeLocal"})
     private final EventDispatcher eventDispatcher;
     @SuppressWarnings({"unused", "FieldCanBeLocal"})
     private final PlotListener plotListener;
+    private final DataSource dataSource;
     private final YamlConfiguration worldConfiguration;
     /**
      * important tasks
@@ -129,21 +134,12 @@ public class SQLManager implements AbstractDB {
      */
     public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
     // Private
-    private Connection connection;
     private boolean supportsGetGeneratedKeys;
     private boolean closed = false;
 
-    /**
+    @Inject
-     * Constructor
-     *
-     * @param database
-     * @param prefix   prefix
-     * @throws SQLException
-     * @throws ClassNotFoundException
-     */
     public SQLManager(
-            final @NonNull Database database,
+            final @NonNull @PlotDatabase DataSource dataSource,
-            final @NonNull String prefix,
             final @NonNull EventDispatcher eventDispatcher,
             final @NonNull PlotListener plotListener,
             @WorldConfig final @NonNull YamlConfiguration worldConfiguration
@@ -153,24 +149,26 @@ public class SQLManager implements AbstractDB {
         this.eventDispatcher = eventDispatcher;
         this.plotListener = plotListener;
         this.worldConfiguration = worldConfiguration;
-        this.database = database;
+        this.dataSource = dataSource;
-        this.connection = database.openConnection();
+        this.mySQL = Storage.MySQL.USE;
-        final DatabaseMetaData databaseMetaData = this.connection.getMetaData();
-        this.supportsGetGeneratedKeys = databaseMetaData.supportsGetGeneratedKeys();
-        this.mySQL = database instanceof MySQL;
         this.globalTasks = new ConcurrentLinkedQueue<>();
         this.notifyTasks = new ConcurrentLinkedQueue<>();
         this.plotTasks = new ConcurrentHashMap<>();
         this.playerTasks = new ConcurrentHashMap<>();
         this.clusterTasks = new ConcurrentHashMap<>();
-        this.prefix = prefix;
+        this.prefix = Storage.PREFIX;
 
-        if (mySQL && !supportsGetGeneratedKeys) {
+        try (final Connection connection = dataSource.getConnection()) {
-            String driver = databaseMetaData.getDriverName();
+            final DatabaseMetaData metaData = connection.getMetaData();
-            String driverVersion = databaseMetaData.getDriverVersion();
+            this.supportsGetGeneratedKeys = metaData.supportsGetGeneratedKeys();
+
+            if (this.mySQL && !this.supportsGetGeneratedKeys) {
+                final String driver = metaData.getDriverName();
+                final String driverVersion = metaData.getDriverVersion();
                 throw new SQLException("Database Driver for MySQL does not support Statement#getGeneratedKeys - which breaks " +
                         "PlotSquared functionality (Using " + driver + ":" + driverVersion + ")");
             }
+        }
 
         this.SET_OWNER = "UPDATE `" + this.prefix
                 + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
@@ -220,11 +218,6 @@ public class SQLManager implements AbstractDB {
                         !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
                                 || !clusterTasks.isEmpty();
                 if (hasTask) {
-                    if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
-                            || !isValid()) {
-                        last = System.currentTimeMillis();
-                        reconnect();
-                    }
                     if (!sendBatch()) {
                         try {
                             if (!getNotifyTasks().isEmpty()) {
@@ -249,32 +242,6 @@ public class SQLManager implements AbstractDB {
         });
     }
 
-    public boolean isValid() {
-        try {
-            if (connection.isClosed()) {
-                return false;
-            }
-        } catch (SQLException e) {
-            return false;
-        }
-        try (PreparedStatement stmt = this.connection.prepareStatement("SELECT 1")) {
-            stmt.execute();
-            return true;
-        } catch (Throwable e) {
-            return false;
-        }
-    }
-
-    public void reconnect() {
-        try {
-            close();
-            SQLManager.this.closed = false;
-            SQLManager.this.connection = database.forceConnection();
-        } catch (SQLException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
     public synchronized Queue<Runnable> getGlobalTasks() {
         return this.globalTasks;
     }
@@ -293,7 +260,7 @@ public class SQLManager implements AbstractDB {
             task = new UniqueStatement(String.valueOf(plot.hashCode())) {
 
                 @Override
-                public PreparedStatement get() {
+                public @Nullable PreparedStatement get(final @NonNull Connection connection) {
                     return null;
                 }
 
@@ -327,7 +294,7 @@ public class SQLManager implements AbstractDB {
             task = new UniqueStatement(String.valueOf(uuid.hashCode())) {
 
                 @Override
-                public PreparedStatement get() {
+                public PreparedStatement get(final @NonNull Connection connection) {
                     return null;
                 }
 
@@ -358,7 +325,7 @@ public class SQLManager implements AbstractDB {
             task = new UniqueStatement(String.valueOf(cluster.hashCode())) {
 
                 @Override
-                public PreparedStatement get() {
+                public @Nullable PreparedStatement get(final @NonNull Connection connection) {
                     return null;
                 }
 
@@ -390,10 +357,10 @@ public class SQLManager implements AbstractDB {
     }
 
     public boolean sendBatch() {
-        try {
+        try (Connection connection = this.dataSource().getConnection()) {
             if (!getGlobalTasks().isEmpty()) {
-                if (this.connection.getAutoCommit()) {
+                if (connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
+                    connection.setAutoCommit(false);
                 }
                 Runnable task = getGlobalTasks().remove();
                 if (task != null) {
@@ -404,18 +371,19 @@ public class SQLManager implements AbstractDB {
                         LOGGER.error("============ DATABASE ERROR ============");
                         LOGGER.error("There was an error updating the database.");
                         LOGGER.error(" - It will be corrected on shutdown");
-                        e.printStackTrace();
+                        LOGGER.error("", e);
                         LOGGER.error("========================================");
                     }
                 }
-                commit();
+                commit(connection);
                 return true;
             }
+
             int count = -1;
             if (!this.plotTasks.isEmpty()) {
                 count = Math.max(count, 0);
-                if (this.connection.getAutoCommit()) {
+                if (connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
+                    connection.setAutoCommit(false);
                 }
                 String method = null;
                 PreparedStatement statement = null;
@@ -469,8 +437,8 @@ public class SQLManager implements AbstractDB {
             }
             if (!this.playerTasks.isEmpty()) {
                 count = Math.max(count, 0);
-                if (this.connection.getAutoCommit()) {
+                if (connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
+                    connection.setAutoCommit(false);
                 }
                 String method = null;
                 PreparedStatement statement = null;
@@ -514,8 +482,8 @@ public class SQLManager implements AbstractDB {
             }
             if (!this.clusterTasks.isEmpty()) {
                 count = Math.max(count, 0);
-                if (this.connection.getAutoCommit()) {
+                if (connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
+                    connection.setAutoCommit(false);
                 }
                 String method = null;
                 PreparedStatement statement = null;
@@ -559,12 +527,12 @@ public class SQLManager implements AbstractDB {
                 }
             }
             if (count > 0) {
-                commit();
+                commit(connection);
                 return true;
             }
             if (count != -1) {
-                if (!this.connection.getAutoCommit()) {
+                if (!connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(true);
+                    connection.setAutoCommit(true);
                 }
             }
             if (!this.clusterTasks.isEmpty()) {
@@ -584,10 +552,6 @@ public class SQLManager implements AbstractDB {
         return false;
     }
 
-    public Connection getConnection() {
-        return this.connection;
-    }
-
     /**
      * Set Plot owner
      *
@@ -606,8 +570,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.SET_OWNER);
+                return connection.prepareStatement(SQLManager.this.SET_OWNER);
             }
         });
     }
@@ -615,7 +579,7 @@ public class SQLManager implements AbstractDB {
     @Override
     public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
         addGlobalTask(() -> {
-            try {
+            try (Connection connection = this.dataSource().getConnection()) {
                 // Create the plots
                 createPlots(myList, () -> {
                     final Map<PlotId, Integer> idMap = new HashMap<>();
@@ -632,7 +596,7 @@ public class SQLManager implements AbstractDB {
                         final ArrayList<UUIDPair> denied = new ArrayList<>();
 
                         // Populating structures
-                        try (PreparedStatement stmt = SQLManager.this.connection
+                        try (PreparedStatement stmt = connection
                                 .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
                              ResultSet result = stmt.executeQuery()) {
                             while (result.next()) {
@@ -657,13 +621,14 @@ public class SQLManager implements AbstractDB {
                             }
                         }
 
-                        createFlags(idMap, myList, () -> createSettings(
+                        createFlags(connection, idMap, myList, () -> createSettings(
+                                connection,
                                 settings,
                                 () -> createTiers(helpers, "helpers",
                                         () -> createTiers(trusted, "trusted",
                                                 () -> createTiers(denied, "denied", () -> {
                                                     try {
-                                                        SQLManager.this.connection.commit();
+                                                        connection.commit();
                                                     } catch (SQLException e) {
                                                         e.printStackTrace();
                                                     }
@@ -677,7 +642,7 @@ public class SQLManager implements AbstractDB {
                     } catch (SQLException e) {
                         LOGGER.warn("Failed to set all flags and member tiers for plots", e);
                         try {
-                            SQLManager.this.connection.commit();
+                            connection.commit();
                         } catch (SQLException e1) {
                             e1.printStackTrace();
                         }
@@ -685,11 +650,6 @@ public class SQLManager implements AbstractDB {
                 });
             } catch (Exception e) {
                 LOGGER.warn("Warning! Failed to set all helper for plots", e);
-                try {
-                    SQLManager.this.connection.commit();
-                } catch (SQLException e1) {
-                    e1.printStackTrace();
-                }
             }
         });
     }
@@ -746,8 +706,13 @@ public class SQLManager implements AbstractDB {
         setBulk(myList, mod, whenDone);
     }
 
-    public void createFlags(Map<PlotId, Integer> ids, List<Plot> plots, Runnable whenDone) {
+    private void createFlags(
-        try (final PreparedStatement preparedStatement = this.connection.prepareStatement(
+            final @NonNull Connection connection,
+            final @NonNull Map<@NonNull PlotId, @NonNull Integer> ids,
+            final @NonNull List<@NonNull Plot> plots,
+            final @NonNull Runnable whenDone
+    ) {
+        try (final PreparedStatement preparedStatement = connection.prepareStatement(
                 "INSERT INTO `" + SQLManager.this.prefix
                         + "plot_flags`(`plot_id`, `flag`, `value`) VALUES(?, ?, ?)")) {
             for (final Plot plot : plots) {
@@ -845,6 +810,7 @@ public class SQLManager implements AbstractDB {
     }
 
     public <T> void setBulk(List<T> objList, StmtMod<T> mod, Runnable whenDone) {
+        try (Connection connection = this.dataSource().getConnection()) {
             int size = objList.size();
             if (size == 0) {
                 if (whenDone != null) {
@@ -872,13 +838,13 @@ public class SQLManager implements AbstractDB {
                     if (last == -1) {
                         last = subList.size();
                         statement = mod.getCreateMySQL(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
+                        preparedStmt = connection.prepareStatement(statement);
                     }
                     if (subList.size() != last || count % 5000 == 0 && count > 0) {
                         preparedStmt.executeBatch();
                         preparedStmt.close();
                         statement = mod.getCreateMySQL(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
+                        preparedStmt = connection.prepareStatement(statement);
                     }
                     for (int i = 0; i < subList.size(); i++) {
                         count++;
@@ -914,13 +880,13 @@ public class SQLManager implements AbstractDB {
                     if (last == -1) {
                         last = subList.size();
                         statement = mod.getCreateSQLite(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
+                        preparedStmt = connection.prepareStatement(statement);
                     }
                     if (subList.size() != last || count % 5000 == 0 && count > 0) {
                         preparedStmt.executeBatch();
                         preparedStmt.clearParameters();
                         statement = mod.getCreateSQLite(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
+                        preparedStmt = connection.prepareStatement(statement);
                     }
                     for (int i = 0; i < subList.size(); i++) {
                         count++;
@@ -937,7 +903,7 @@ public class SQLManager implements AbstractDB {
                 e.printStackTrace();
                 LOGGER.error("2: | {}", objList.get(0).getClass().getCanonicalName());
                 LOGGER.error("Could not bulk save!");
-            try (PreparedStatement preparedStmt = this.connection
+                try (PreparedStatement preparedStmt = connection
                         .prepareStatement(mod.getCreateSQL())) {
                     for (T obj : objList) {
                         mod.setSQL(preparedStmt, obj);
@@ -952,10 +918,16 @@ public class SQLManager implements AbstractDB {
             if (whenDone != null) {
                 whenDone.run();
             }
+        } catch (Exception e) {
+            LOGGER.error("Failed to create SQL connection", e);
+        }
     }
 
-    public void createSettings(final ArrayList<LegacySettings> myList, final Runnable whenDone) {
+    private void createSettings(
-        try (final PreparedStatement preparedStatement = this.connection.prepareStatement(
+            final @NonNull Connection connection,
+            final @NonNull List<@NonNull LegacySettings> myList,
+            final @NonNull Runnable whenDone) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement(
                 "INSERT INTO `" + SQLManager.this.prefix + "plot_settings`"
                         + "(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`merged`,`position`) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
 
@@ -1082,8 +1054,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         SQLManager.this.CREATE_PLOT_SAFE,
                         Statement.RETURN_GENERATED_KEYS
                 );
@@ -1109,8 +1081,8 @@ public class SQLManager implements AbstractDB {
                                 }
 
                                 @Override
-                                public PreparedStatement get() throws SQLException {
+                                public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                                    return SQLManager.this.connection.prepareStatement(
+                                    return connection.prepareStatement(
                                             "INSERT INTO `" + SQLManager.this.prefix
                                                     + "plot_settings`(`plot_plot_id`) VALUES(?)");
                                 }
@@ -1129,17 +1101,14 @@ public class SQLManager implements AbstractDB {
         });
     }
 
-    public void commit() {
+    private void commit(final @NonNull Connection connection) {
-        if (this.closed) {
-            return;
-        }
         try {
-            if (!this.connection.getAutoCommit()) {
+            if (!connection.getAutoCommit()) {
-                this.connection.commit();
+                connection.commit();
-                this.connection.setAutoCommit(true);
+                connection.setAutoCommit(true);
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            LOGGER.error("Failed to commit database transaction", e);
         }
     }
 
@@ -1156,8 +1125,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection
+                return connection
                         .prepareStatement(SQLManager.this.CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
             }
 
@@ -1182,8 +1151,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "INSERT INTO `" + SQLManager.this.prefix
                                 + "plot_settings`(`plot_plot_id`) VALUES(?)");
             }
@@ -1198,6 +1167,7 @@ public class SQLManager implements AbstractDB {
      */
     @Override
     public void createTables() throws SQLException {
+        try (Connection connection = this.dataSource().getConnection()) {
             String[] tables =
                     new String[]{"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted",
                             "plot_rating", "plot_settings", "cluster", "player_meta", "plot_flags"};
@@ -1215,7 +1185,7 @@ public class SQLManager implements AbstractDB {
                 return;
             }
             boolean addConstraint = create == tables.length;
-        try (Statement stmt = this.connection.createStatement()) {
+            try (Statement stmt = connection.createStatement()) {
                 if (this.mySQL) {
                     stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
                             + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
@@ -1350,6 +1320,7 @@ public class SQLManager implements AbstractDB {
                 stmt.clearBatch();
             }
         }
+    }
 
     @Override
     public void deleteSettings(final Plot plot) {
@@ -1360,8 +1331,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "DELETE FROM `" + SQLManager.this.prefix
                                 + "plot_settings` WHERE `plot_plot_id` = ?");
             }
@@ -1380,8 +1351,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "DELETE FROM `" + SQLManager.this.prefix
                                 + "plot_helpers` WHERE `plot_plot_id` = ?");
             }
@@ -1400,8 +1371,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "DELETE FROM `" + SQLManager.this.prefix
                                 + "plot_trusted` WHERE `plot_plot_id` = ?");
             }
@@ -1420,8 +1391,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "DELETE FROM `" + SQLManager.this.prefix
                                 + "plot_denied` WHERE `plot_plot_id` = ?");
             }
@@ -1438,8 +1409,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "DELETE FROM `" + SQLManager.this.prefix
                                 + "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
             }
@@ -1458,8 +1429,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "DELETE FROM `" + SQLManager.this.prefix
                                 + "plot_rating` WHERE `plot_plot_id` = ?");
             }
@@ -1486,8 +1457,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = ?");
             }
         });
@@ -1508,8 +1479,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "INSERT INTO `" + SQLManager.this.prefix
                                 + "plot_settings`(`plot_plot_id`) VALUES(?)");
             }
@@ -1518,16 +1489,12 @@ public class SQLManager implements AbstractDB {
 
     @Override
     public int getClusterId(PlotCluster cluster) {
-        if (cluster.temp > 0) {
+        try (Connection connection = this.dataSource.getConnection()) {
-            return cluster.temp;
-        }
-        try {
-            commit();
             if (cluster.temp > 0) {
                 return cluster.temp;
             }
             int c_id;
-            try (PreparedStatement stmt = this.connection.prepareStatement(
+            try (PreparedStatement stmt = connection.prepareStatement(
                     "SELECT `id` FROM `" + this.prefix
                             + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC")) {
                 stmt.setInt(1, cluster.getP1().getX());
@@ -1561,13 +1528,12 @@ public class SQLManager implements AbstractDB {
         if (plot.temp > 0) {
             return plot.temp;
         }
-        try {
+        try (Connection connection = this.dataSource().getConnection()) {
-            commit();
             if (plot.temp > 0) {
                 return plot.temp;
             }
             int id;
-            try (PreparedStatement statement = this.connection.prepareStatement(
+            try (PreparedStatement statement = connection.prepareStatement(
                     "SELECT `id` FROM `" + this.prefix
                             + "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC")) {
                 statement.setInt(1, plot.getId().getX());
@@ -1596,15 +1562,15 @@ public class SQLManager implements AbstractDB {
 
     @Override
     public void updateTables(int[] oldVersion) {
-        try {
+        try (Connection connection = this.dataSource().getConnection()) {
             if (this.mySQL && !PlotSquared.get().checkVersion(oldVersion, 3, 3, 2)) {
-                try (Statement stmt = this.connection.createStatement()) {
+                try (Statement stmt = connection.createStatement()) {
                     stmt.executeUpdate(
                             "ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
                 } catch (SQLException ignored) {
                 }
             }
-            DatabaseMetaData data = this.connection.getMetaData();
+            DatabaseMetaData data = connection.getMetaData();
             ResultSet rs =
                     data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
             if (rs.next()) {
@@ -1612,7 +1578,7 @@ public class SQLManager implements AbstractDB {
                 rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode");
                 if (!rs.next()) {
                     rs.close();
-                    try (Statement statement = this.connection.createStatement()) {
+                    try (Statement statement = connection.createStatement()) {
                         statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
                         if (Storage.MySQL.USE) {
                             statement.addBatch(
@@ -1647,7 +1613,7 @@ public class SQLManager implements AbstractDB {
             rs.close();
             rs = data.getColumns(null, null, this.prefix + "plot_denied", "plot_plot_id");
             if (rs.next()) {
-                try (Statement statement = this.connection.createStatement()) {
+                try (Statement statement = connection.createStatement()) {
                     statement.executeUpdate("DELETE FROM `" + this.prefix
                             + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `"
                             + this.prefix + "plot`)");
@@ -1656,7 +1622,7 @@ public class SQLManager implements AbstractDB {
                 }
 
                 rs.close();
-                try (Statement statement = this.connection.createStatement()) {
+                try (Statement statement = connection.createStatement()) {
                     for (String table : new String[]{"plot_denied", "plot_helpers",
                             "plot_trusted"}) {
                         ResultSet result = statement.executeQuery(
@@ -1728,9 +1694,12 @@ public class SQLManager implements AbstractDB {
     @Override
     public boolean convertFlags() {
         final Map<Integer, Map<String, String>> flagMap = new HashMap<>();
-        try (Statement statement = this.connection.createStatement()) {
+        try (
-            try (ResultSet resultSet = statement
+                Connection connection = this.dataSource().getConnection();
-                    .executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) {
+                Statement statement = connection.createStatement();
+                ResultSet resultSet = statement
+                        .executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")
+        ) {
             while (resultSet.next()) {
                 final int id = resultSet.getInt("plot_plot_id");
                 final String plotFlags = resultSet.getString("flags");
@@ -1751,14 +1720,14 @@ public class SQLManager implements AbstractDB {
                     }
                 }
             }
-            }
         } catch (final Exception e) {
             LOGGER.error("Failed to load old flag values", e);
             return false;
         }
         LOGGER.info("Loaded {} plot flag collections...", flagMap.size());
         LOGGER.info("Attempting to store these flags in the new table...");
-        try (final PreparedStatement preparedStatement = this.connection.prepareStatement(
+        try (Connection connection = this.dataSource().getConnection(); PreparedStatement preparedStatement =
+                connection.prepareStatement(
                 "INSERT INTO `" + SQLManager.this.prefix
                         + "plot_flags`(`plot_id`, `flag`, `value`) VALUES(?, ?, ?)")) {
 
@@ -1843,7 +1812,7 @@ public class SQLManager implements AbstractDB {
             /*
              * Getting plots
              */
-            try (Statement statement = this.connection.createStatement()) {
+            try (Connection connection = this.dataSource().getConnection(); Statement statement = connection.createStatement()) {
                 int id;
                 String o;
                 UUID user;
@@ -2176,8 +2145,8 @@ public class SQLManager implements AbstractDB {
             }
 
             @Override
-            public PreparedStatement get() throws SQLException {
+            public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
+                return connection.prepareStatement(
                         "UPDATE `" + SQLManager.this.prefix
                                 + "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
             }
@@ -3162,6 +3131,8 @@ public class SQLManager implements AbstractDB {
 
             @Override
             public PreparedStatement get() throws SQLException {
+                try (final Connection connection = )
+
                 return SQLManager.this.connection.prepareStatement(
                         "DELETE FROM `" + SQLManager.this.prefix
                                 + "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
@@ -3429,13 +3400,16 @@ public class SQLManager implements AbstractDB {
     @Override
     public void close() {
         try {
-            this.closed = true;
+            ((Closeable) this.dataSource()).close();
-            this.connection.close();
+        } catch (Exception e) {
-        } catch (SQLException e) {
+            LOGGER.error("Failed to close data source", e);
-            e.printStackTrace();
         }
     }
 
+    private @NonNull DataSource dataSource() {
+        return this.dataSource;
+    }
+
     private record LegacySettings(
             int id,
             PlotSettings settings
@@ -3459,7 +3433,7 @@ public class SQLManager implements AbstractDB {
             statement.executeBatch();
         }
 
-        public abstract PreparedStatement get() throws SQLException;
+        public abstract @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException;
 
         public abstract void set(PreparedStatement statement) throws SQLException;
 

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

@@ -33,6 +33,7 @@ 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

@@ -1,77 +0,0 @@
-/*
- * 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 TODO
- */
-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 TODO
-     */
-    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 TODO
-     */
-    public @NonNegative int limit() {
-        return limit;
-    }
-
-    /**
-     * The player for which the limit is queried.
-     *
-     * @return the player.
-     * @since TODO
-     */
-    public @NonNull PlotPlayer<?> player() {
-        return player;
-    }
-
-}

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

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

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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,72 @@
+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

@@ -0,0 +1,15 @@
+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/location/Direction.java

@@ -55,25 +55,6 @@ 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/PermissionHolder.java

@@ -100,7 +100,6 @@ 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())) {
@@ -109,7 +108,6 @@ 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,8 +306,7 @@ 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() {
-        final int calculatedLimit = hasPermissionRange("plots.plot", Settings.Limit.MAX_PLOTS);
+        return 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,7 +29,6 @@ import com.plotsquared.core.configuration.caption.CaptionUtility;
 import com.plotsquared.core.configuration.caption.StaticCaption;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.events.PlayerTeleportToPlotEvent;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.generator.ClassicPlotWorld;
@@ -86,7 +85,6 @@ 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;
@@ -2285,8 +2283,8 @@ public class Plot {
     }
 
     /**
-     * Gets a set of plots connected (and including) this plot.
+     * Gets a set of plots connected (and including) this plot<br>
-     * The returned set is immutable.
+     * - This result is cached globally
      *
      * @return a Set of Plots connected to this Plot
      */
@@ -2297,75 +2295,117 @@ 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;
         }
 
-        Set<Plot> tmpSet = new HashSet<>();
+        HashSet<Plot> tmpSet = new HashSet<>();
         tmpSet.add(this);
-        HashSet<Plot> queueCache = new HashSet<>();
+        Plot tmp;
+        HashSet<Object> queuecache = new HashSet<>();
         ArrayDeque<Plot> frontier = new ArrayDeque<>();
-        computeDirectMerged(queueCache, frontier, Direction.NORTH);
+        if (this.isMerged(Direction.NORTH)) {
-        computeDirectMerged(queueCache, frontier, Direction.EAST);
+            tmp = this.area.getPlotAbs(this.id.getRelative(Direction.NORTH));
-        computeDirectMerged(queueCache, frontier, Direction.SOUTH);
+            if (!tmp.isMerged(Direction.SOUTH)) {
-        computeDirectMerged(queueCache, frontier, Direction.WEST);
+                // 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);
+        }
         Plot current;
         while ((current = frontier.poll()) != null) {
             if (!current.hasOwner() || current.settings == null) {
                 continue;
             }
             tmpSet.add(current);
-            queueCache.remove(current);
+            queuecache.remove(current);
-            addIfIncluded(current, Direction.NORTH, queueCache, tmpSet, frontier);
+            if (current.isMerged(Direction.NORTH)) {
-            addIfIncluded(current, Direction.EAST, queueCache, tmpSet, frontier);
+                tmp = current.area.getPlotAbs(current.id.getRelative(Direction.NORTH));
-            addIfIncluded(current, Direction.SOUTH, queueCache, tmpSet, frontier);
+                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-            addIfIncluded(current, Direction.WEST, queueCache, tmpSet, frontier);
+                    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);
+                }
+            }
         }
-        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>
@@ -2574,9 +2614,8 @@ 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();
-        PlayerTeleportToPlotEvent event = this.eventDispatcher.callTeleport(player, player.getLocation(), plot, cause);
+        if (result == Result.DENY) {
-        if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
                     TranslatableCaption.of("events.event_denied"),
                     TagResolver.resolver("value", Tag.inserting(Component.text("Teleport")))
@@ -2584,10 +2623,7 @@ 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);
@@ -2643,11 +2679,6 @@ 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);
@@ -2661,7 +2692,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(false);
+        int border = this.area.getBorder();
         if (border == Integer.MAX_VALUE) {
             return;
         }

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

@@ -147,7 +147,6 @@ 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;
@@ -357,7 +356,6 @@ 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");
@@ -491,7 +489,6 @@ 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",
@@ -940,9 +937,7 @@ 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) {
@@ -956,27 +951,6 @@ 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).
      */
@@ -1236,16 +1210,6 @@ 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,7 +42,6 @@ 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;
@@ -154,7 +153,6 @@ 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);

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

@@ -1,41 +0,0 @@
-/*
- * 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 TODO
- */
-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/util/EventDispatcher.java

@@ -30,7 +30,6 @@ 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;
@@ -64,7 +63,6 @@ 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;
@@ -76,7 +74,6 @@ 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;
@@ -309,12 +306,6 @@ 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
@@ -401,12 +392,6 @@ public class EventDispatcher {
                 if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), 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) {
                     player.sendMessage(
                             TranslatableCaption.of("commandconfig.flag_tutorial_usage"),

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/resources/lang/messages_en.json

@@ -555,7 +555,6 @@
   "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>",

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 xyz.jpenilla.runpaper.task.RunServer
 import java.net.URI
+import xyz.jpenilla.runpaper.task.RunServer
 
 plugins {
     java
@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.2.1-SNAPSHOT"
+version = "7.1.1-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -79,8 +79,7 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.1")
     }
 
     plugins.withId("java") {

gradle/libs.versions.toml

@@ -2,8 +2,8 @@
 # Platform expectations
 paper = "1.20.2-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.8.2"
+spotbugs = "4.7.3"
-checkerqual = "3.40.0"
+checkerqual = "3.39.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
@@ -12,13 +12,17 @@ adventure-bukkit = "4.3.1"
 log4j = "2.19.0"
 
 # Plugins
-worldedit = "7.2.17"
+worldedit = "7.2.16"
-fawe = "2.8.2"
+fawe = "2.8.0"
-placeholderapi = "2.11.5"
+placeholderapi = "2.11.4"
 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"
@@ -35,9 +39,9 @@ serverlib = "2.3.4"
 # Gradle plugins
 shadow = "8.1.1"
 grgit = "4.1.1"
-spotless = "6.23.2"
+spotless = "6.22.0"
 nexus = "1.3.0"
-runPaper = "2.2.2"
+runPaper = "2.2.0"
 
 [libraries]
 # Platform expectations
@@ -63,6 +67,11 @@ 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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME