fix: binary incompatibility on 1.21.1

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,7 +27,7 @@ body:
       description: Which server version are you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
-        - '1.21.11'
+        - '1.21.4'
         - '1.21.3'
         - '1.21.1'
         - '1.20.6'

.github/stale.yml

@@ -0,0 +1,18 @@
+daysUntilStale: 30
+daysUntilClose: 7
+only: issues
+exemptLabels:
+  - "Bug"
+  - "Enhancement"
+  - "Approved"
+  - "Priority"
+  - "Under investigation"
+staleLabel: "resolution: stale"
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. If the issue is still present and can be reproduced, please let the team know.
+  Thank you for your contributions.
+closeComment: >
+  This issue has been automatically closed because it has not had activity in
+  a long time. If the issue still applies to the most recent supported
+  version, please reply to this issue and the team will reopen it.

.github/workflows/build-pr.yml

@@ -9,9 +9,9 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v4
       - name: Setup Java
         uses: actions/setup-java@v5
         with:

.github/workflows/build.yml

@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v4
       - name: Setup Java
         uses: actions/setup-java@v5
         with:

.github/workflows/codeql.yml

@@ -20,17 +20,17 @@ jobs:
         language: [ 'java' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v4
+        uses: github/codeql-action/autobuild@v3
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@v3

Bukkit/build.gradle.kts

@@ -110,9 +110,9 @@ tasks {
         val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://jd.papermc.io/paper/1.20.4/")
-//        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
+        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
         opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
-//        opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
+        opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
         opt.isLinkSource = true

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

@@ -219,7 +219,7 @@ public class BlockEventListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.LOWEST)
     public void blockDestroy(BlockBreakEvent event) {
         Player player = event.getPlayer();
         Location location = BukkitUtil.adapt(event.getBlock().getLocation());

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

@@ -160,7 +160,7 @@ public class EntityEventListener implements Listener {
                     return;
                 }
             }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SILVERFISH_BLOCK", "ENDER_PEARL",
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
                  "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
                  "FROZEN", "SPELL", "DEFAULT" -> {
                 if (!area.isMobSpawning()) {

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

@@ -104,10 +104,6 @@ public class PaperListener implements Listener {
         }
         Plot plot = area.getPlot(location);
         if (plot != null) {
-            // Prevent dropping blocks which normally would not be dropped.
-            if (!event.willDrop()) {
-                return;
-            }
             event.setWillDrop(plot.getFlag(TileDropFlag.class));
         }
     }
@@ -206,7 +202,7 @@ public class PaperListener implements Listener {
                     return;
                 }
             }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
                 if (!area.isMobSpawning()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);

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

@@ -600,7 +600,7 @@ public class PlayerEventListener implements Listener {
                 PlotArea area = location.getPlotArea();
                 if (area == null) {
                     if (lastPlot != null) {
-                        plotListener.plotExit(pp, lastPlot, null, null);
+                        plotListener.plotExit(pp, lastPlot);
                         lastPlotAccess.remove();
                     }
                     try (final MetaDataAccess<Location> lastLocationAccess =
@@ -753,7 +753,7 @@ public class PlayerEventListener implements Listener {
             if (now == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, now, area) && this.tmpTeleport && !kickAccess.get().orElse(
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
                             false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
@@ -847,7 +847,7 @@ public class PlayerEventListener implements Listener {
             if (plot == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, null, area) && this.tmpTeleport && !kickAccess.get().orElse(
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
                             false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),

Core/build.gradle.kts

@@ -67,8 +67,8 @@ tasks {
     withType<Javadoc> {
         val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
-//        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
+        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
-//        opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
+        opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
         opt.links("https://jd.advntr.dev/text-minimessage/" + libs.adventureApi.get().versionConstraint.toString())
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")

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

@@ -23,8 +23,6 @@ import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.events.PlayerPlotAddRemoveEvent;
-import com.plotsquared.core.events.Result;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -153,21 +151,8 @@ public class Add extends Command {
                         return;
                     }
                     // Success
-                    confirm.run(
+                    confirm.run(this, () -> {
-                            this, () -> {
                         for (UUID uuid : uuids) {
-                                    if (this.eventDispatcher.callPlayerAdd(
-                                            player,
-                                            plot,
-                                            uuid,
-                                            PlayerPlotAddRemoveEvent.Reason.COMMAND
-                                    ).getEventResult() == Result.DENY) {
-                                        player.sendMessage(
-                                                TranslatableCaption.of("events.event_denied"),
-                                                TagResolver.resolver("value", Tag.inserting(Component.text("Add")))
-                                        );
-                                        continue;
-                                    }
                             if (uuid != DBFunc.EVERYONE) {
                                 if (!plot.removeTrusted(uuid)) {
                                     if (plot.getDenied().contains(uuid)) {
@@ -177,17 +162,9 @@ public class Add extends Command {
                             }
                             plot.addMember(uuid);
                             this.eventDispatcher.callMember(player, plot, uuid, true);
-                                    this.eventDispatcher.callPostAdded(
-                                            player,
-                                            plot,
-                                            uuid,
-                                            false,
-                                            PlayerPlotAddRemoveEvent.Reason.COMMAND
-                                    );
                             player.sendMessage(TranslatableCaption.of("member.member_added"));
                         }
-                            }, null
+                    }, null);
-                    );
                 } catch (final Throwable exception) {
                     future.completeExceptionally(exception);
                     return;

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

@@ -90,7 +90,7 @@ public class DebugRoadRegen extends SubCommand {
     }
 
     public boolean regenPlot(PlotPlayer<?> player) {
-        PlotArea area = player.getContextualPlotArea();
+        PlotArea area = player.getCurrentPlot().getArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
             return false;
@@ -145,10 +145,9 @@ public class DebugRoadRegen extends SubCommand {
             return false;
         }
 
-        PlotArea area = player.getContextualPlotArea();
+        PlotArea area = player.getCurrentPlot().getArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
-            return false;
         }
         Plot plot = player.getCurrentPlot();
         PlotManager manager = area.getPlotManager();

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

@@ -23,8 +23,6 @@ import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.events.PlayerPlotAddRemoveEvent;
-import com.plotsquared.core.events.Result;
 import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
@@ -126,29 +124,21 @@ public class Deny extends SubCommand {
                         );
                         return;
                     } else {
-                        if (this.eventDispatcher
-                                .callPlayerDeny(player, plot, uuid, PlayerPlotAddRemoveEvent.Reason.COMMAND)
-                                .getEventResult() == Result.DENY) {
-                            player.sendMessage(
-                                    TranslatableCaption.of("events.event_denied"),
-                                    TagResolver.resolver("value", Tag.inserting(Component.text("Deny")))
-                            );
-                            continue;
-                        }
                         if (uuid != DBFunc.EVERYONE) {
                             plot.removeMember(uuid);
                             plot.removeTrusted(uuid);
                         }
                         plot.addDenied(uuid);
                         this.eventDispatcher.callDenied(player, plot, uuid, true);
-                        this.eventDispatcher.callPostDenied(player, plot, uuid, true, PlayerPlotAddRemoveEvent.Reason.COMMAND);
                         if (!uuid.equals(DBFunc.EVERYONE)) {
                             handleKick(PlotSquared.platform().playerManager().getPlayerIfExists(uuid), plot);
                         } else {
                             for (PlotPlayer<?> plotPlayer : plot.getPlayersInPlot()) {
-                                if (plot.isDenied(plotPlayer.getUUID())) {
+                                // Ignore plot-owners
-                                    handleKick(plotPlayer, plot);
+                                if (plot.isAdded(plotPlayer.getUUID())) {
+                                    continue;
                                 }
+                                handleKick(plotPlayer, plot);
                             }
                         }
                     }

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

@@ -20,8 +20,6 @@ package com.plotsquared.core.command;
 
 import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.events.PlayerPlotAddRemoveEvent;
-import com.plotsquared.core.events.Result;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.util.EventDispatcher;
@@ -63,22 +61,11 @@ public class Leave extends Command {
         } else {
             UUID uuid = player.getUUID();
             if (plot.isAdded(uuid)) {
-                if (this.eventDispatcher
-                        .callPlayerRemove(player, plot, uuid, PlayerPlotAddRemoveEvent.Reason.COMMAND)
-                        .getEventResult() == Result.DENY) {
-                    player.sendMessage(
-                            TranslatableCaption.of("events.event_denied"),
-                            TagResolver.resolver("value", Tag.inserting(Component.text("Leave")))
-                    );
-                    return  CompletableFuture.completedFuture(true);
-                }
                 if (plot.removeTrusted(uuid)) {
                     this.eventDispatcher.callTrusted(player, plot, uuid, false);
-                    this.eventDispatcher.callPostTrusted(player, plot, uuid, false, PlayerPlotAddRemoveEvent.Reason.COMMAND);
                 }
                 if (plot.removeMember(uuid)) {
                     this.eventDispatcher.callMember(player, plot, uuid, false);
-                    this.eventDispatcher.callPostAdded(player, plot, uuid, false, PlayerPlotAddRemoveEvent.Reason.COMMAND);
                 }
                 player.sendMessage(
                         TranslatableCaption.of("member.plot_left"),

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

@@ -150,8 +150,8 @@ public class ListCmd extends SubCommand {
             page = 0;
         }
 
-        PlotArea area = player.getContextualPlotArea();
+        String world = player.getCurrentPlot().getWorldName();
-        String world = area != null ? area.getWorldName() : "";
+        PlotArea area = player.getCurrentPlot().getArea();
         String arg = args[0].toLowerCase();
         final boolean[] sort = new boolean[]{true};
 

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

@@ -68,6 +68,11 @@ public class Load extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, final String[] args) {
+        final String world = player.getCurrentPlot().getWorldName();
+        if (!this.plotAreaManager.hasPlotArea(world)) {
+            player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
+            return false;
+        }
         final Plot plot = player.getCurrentPlot();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));

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

@@ -21,8 +21,6 @@ package com.plotsquared.core.command;
 import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.events.PlayerPlotAddRemoveEvent;
-import com.plotsquared.core.events.Result;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -84,48 +82,33 @@ public class Remove extends SubCommand {
                 return;
             } else if (!uuids.isEmpty()) {
                 for (UUID uuid : uuids) {
-                    if (this.eventDispatcher
-                            .callPlayerRemove(player, plot, uuid, PlayerPlotAddRemoveEvent.Reason.COMMAND)
-                            .getEventResult() == Result.DENY) {
-                        player.sendMessage(
-                                TranslatableCaption.of("events.event_denied"),
-                                TagResolver.resolver("value", Tag.inserting(Component.text("Remove")))
-                        );
-                        continue;
-                    }
                     if (plot.getTrusted().contains(uuid)) {
                         if (plot.removeTrusted(uuid)) {
                             this.eventDispatcher.callTrusted(player, plot, uuid, false);
-                            this.eventDispatcher.callPostTrusted(player, plot, uuid, false, PlayerPlotAddRemoveEvent.Reason.COMMAND);
                             count++;
                         }
                     } else if (plot.getMembers().contains(uuid)) {
                         if (plot.removeMember(uuid)) {
                             this.eventDispatcher.callMember(player, plot, uuid, false);
-                            this.eventDispatcher.callPostAdded(player, plot, uuid, false, PlayerPlotAddRemoveEvent.Reason.COMMAND);
                             count++;
                         }
                     } else if (plot.getDenied().contains(uuid)) {
                         if (plot.removeDenied(uuid)) {
                             this.eventDispatcher.callDenied(player, plot, uuid, false);
-                            this.eventDispatcher.callPostDenied(player, plot, uuid, true, PlayerPlotAddRemoveEvent.Reason.COMMAND);
                             count++;
                         }
                     } else if (uuid == DBFunc.EVERYONE) {
                         count += plot.getTrusted().size();
                         if (plot.removeTrusted(uuid)) {
                             this.eventDispatcher.callTrusted(player, plot, uuid, false);
-                            this.eventDispatcher.callPostTrusted(player, plot, uuid, false, PlayerPlotAddRemoveEvent.Reason.COMMAND);
                         }
                         count += plot.getMembers().size();
                         if (plot.removeMember(uuid)) {
                             this.eventDispatcher.callMember(player, plot, uuid, false);
-                            this.eventDispatcher.callPostAdded(player, plot, uuid, false, PlayerPlotAddRemoveEvent.Reason.COMMAND);
                         }
                         count += plot.getDenied().size();
                         if (plot.removeDenied(uuid)) {
                             this.eventDispatcher.callDenied(player, plot, uuid, false);
-                            this.eventDispatcher.callPostDenied(player, plot, uuid, true, PlayerPlotAddRemoveEvent.Reason.COMMAND);
                         }
                     }
                 }

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

@@ -78,7 +78,7 @@ public class Set extends SubCommand {
 
             @Override
             public boolean set(PlotPlayer<?> player, final Plot plot, String value) {
-                final PlotArea plotArea = player.getContextualPlotArea();
+                final PlotArea plotArea = player.getCurrentPlot().getArea();
                 if (plotArea == null) {
                     return false;
                 }

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

@@ -23,8 +23,6 @@ import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
-import com.plotsquared.core.events.PlayerPlotAddRemoveEvent;
-import com.plotsquared.core.events.Result;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -152,19 +150,8 @@ public class Trust extends Command {
                     return;
                 }
                 // Success
-                confirm.run(
+                confirm.run(this, () -> {
-                        this, () -> {
                     for (UUID uuid : uuids) {
-                                if (this.eventDispatcher
-                                        .callPlayerTrust(player, currentPlot, uuid, PlayerPlotAddRemoveEvent.Reason.COMMAND)
-                                        .getEventResult() == Result.DENY) {
-                                    player.sendMessage(
-                                            TranslatableCaption.of("events.event_denied"),
-                                            TagResolver.resolver("value", Tag.inserting(Component.text("Trust")))
-                                    );
-                                    return;
-                                }
-
                         if (uuid != DBFunc.EVERYONE) {
                             if (!currentPlot.removeMember(uuid)) {
                                 if (currentPlot.getDenied().contains(uuid)) {
@@ -174,21 +161,12 @@ public class Trust extends Command {
                         }
                         currentPlot.addTrusted(uuid);
                         this.eventDispatcher.callTrusted(player, currentPlot, uuid, true);
-                                this.eventDispatcher.callPostTrusted(
-                                        player,
-                                        currentPlot,
-                                        uuid,
-                                        false,
-                                        PlayerPlotAddRemoveEvent.Reason.COMMAND
-                                );
                         player.sendMessage(TranslatableCaption.of("trusted.trusted_added"));
                     }
-                        }, null
+                }, null);
-                );
             }
             future.complete(true);
-                }
+        });
-        );
         return CompletableFuture.completedFuture(true);
     }
 

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

@@ -435,11 +435,6 @@ public class Settings extends Config {
 
         public static String SCHEMATICS = "schematics";
         public static String TEMPLATES = "templates";
-        @Comment({"If schematics used for generation should be searched for in the path.schematics location",
-                " - This setting exists and is `false` by default for backwards compatibility.",
-                " - If false then generation schematics must be located in `schematics`",
-                " - Schematics must still always be under GEN_ROAD_SCHEMATIC/<world> etc."})
-        public static boolean USE_SCHEMATICS_PATH_FOR_GEN_SCHEMATICS = false;
 
     }
 

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

@@ -1,45 +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 com.plotsquared.core.plot.Plot;
-
-import java.util.UUID;
-
-/**
- * Called when a player is going to be added to a plot
- *
- * @since TODO
- */
-public class PlayerPlotAddEvent extends PlayerPlotAddRemoveCancellableEvent {
-
-    /**
-     * Called when a player will be added to a plot
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that will be added
-     * @param reason    The reason for the add
-     */
-    public PlayerPlotAddEvent(PlotPlayer<?> initiator, Plot plot, UUID player, Reason reason) {
-        super(initiator, plot, player, reason);
-    }
-
-}

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

@@ -1,55 +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 com.plotsquared.core.plot.Plot;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.UUID;
-
-/**
- * Parent class for the varies events regarding a player being added/removed/denied/trusted
- *
- * @since TODO
- */
-public class PlayerPlotAddRemoveCancellableEvent extends PlayerPlotAddRemoveEvent implements CancellablePlotEvent {
-
-    private Result eventResult;
-
-    protected PlayerPlotAddRemoveCancellableEvent(
-            final PlotPlayer<?> initiator,
-            Plot plot,
-            final UUID player,
-            final Reason reason
-    ) {
-        super(initiator, plot, player, reason);
-    }
-
-    @Override
-    public @Nullable Result getEventResult() {
-        return eventResult;
-    }
-
-    @Override
-    public void setEventResult(@Nullable final Result eventResult) {
-        this.eventResult = eventResult;
-    }
-
-}

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

@@ -1,88 +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 com.plotsquared.core.plot.Plot;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.UUID;
-
-/**
- * Parent class for the varies events regarding a player being added/removed/denied/trusted
- *
- * @since TODO
- */
-public class PlayerPlotAddRemoveEvent extends PlotEvent {
-
-    private final Reason reason;
-    private final PlotPlayer<?> initiator;
-    private final UUID player;
-
-    protected PlayerPlotAddRemoveEvent(final PlotPlayer<?> initiator, Plot plot, final UUID player, final Reason reason) {
-        super(plot);
-        this.initiator = initiator;
-        this.player = player;
-        this.reason = reason;
-    }
-
-    /**
-     * The player to be added/denied/removed/trusted.
-     *
-     * @return UUID
-     */
-    public UUID getPlayer() {
-        return this.player;
-    }
-
-    /**
-     * The player initiating the action. May be null (if a player, or a {@link com.plotsquared.core.player.ConsolePlayer}.
-     *
-     * @return PlotPlayer
-     */
-    @Nullable
-    public PlotPlayer<?> getInitiator() {
-        return this.initiator;
-    }
-
-    /**
-     * Get the reason the player is being added/removed/denied/trusted
-     *
-     * @return Reason
-     */
-    public Reason getReason() {
-        return this.reason;
-    }
-
-    public enum Reason {
-        /**
-         * If a plot merge caused the player to be added/removed/denied/trusted
-         */
-        MERGE,
-        /**
-         * If a command caused the player to be added/removed/denied/trusted
-         */
-        COMMAND,
-        /**
-         * If something unknown caused the player to be added/removed/denied/trusted
-         */
-        UNKNOWN
-    }
-
-}

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

@@ -23,10 +23,6 @@ import com.plotsquared.core.plot.Plot;
 
 import java.util.UUID;
 
-/**
- * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotDeniedEvent}
- */
-@Deprecated(forRemoval = true, since = "TODO")
 public class PlayerPlotDeniedEvent extends PlotEvent {
 
     private final PlotPlayer<?> initiator;
@@ -40,9 +36,7 @@ public class PlayerPlotDeniedEvent extends PlotEvent {
      * @param plot      Plot in which the event occurred
      * @param player    Player that was denied/un-denied
      * @param added     {@code true} of add to deny list, {@code false} if removed
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotDeniedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public PlayerPlotDeniedEvent(PlotPlayer<?> initiator, Plot plot, UUID player, boolean added) {
         super(plot);
         this.initiator = initiator;
@@ -54,9 +48,7 @@ public class PlayerPlotDeniedEvent extends PlotEvent {
      * If a user was added.
      *
      * @return boolean
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotDeniedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public boolean wasAdded() {
         return this.added;
     }
@@ -65,9 +57,7 @@ public class PlayerPlotDeniedEvent extends PlotEvent {
      * The player added/removed.
      *
      * @return UUID
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotDeniedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public UUID getPlayer() {
         return this.player;
     }
@@ -76,9 +66,7 @@ public class PlayerPlotDeniedEvent extends PlotEvent {
      * The player initiating the action.
      *
      * @return PlotPlayer
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotDeniedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public PlotPlayer<?> getInitiator() {
         return this.initiator;
     }

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

@@ -1,45 +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 com.plotsquared.core.plot.Plot;
-
-import java.util.UUID;
-
-/**
- * Called when a player is going to be denied from a plot
- *
- * @since TODO
- */
-public class PlayerPlotDenyEvent extends PlayerPlotAddRemoveCancellableEvent {
-
-    /**
-     * Called when a player will be denied from a plot
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that will be denied
-     * @param reason    The reason for the deny
-     */
-    public PlayerPlotDenyEvent(PlotPlayer<?> initiator, Plot plot, UUID player, Reason reason) {
-        super(initiator, plot, player, reason);
-    }
-
-}

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

@@ -24,9 +24,8 @@ import com.plotsquared.core.plot.Plot;
 import java.util.UUID;
 
 /**
- * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotAddedEvent}
+ *
  */
-@Deprecated(forRemoval = true, since = "TODO")
 public class PlayerPlotHelperEvent extends PlotEvent {
 
     private final PlotPlayer<?> initiator;
@@ -40,9 +39,7 @@ public class PlayerPlotHelperEvent extends PlotEvent {
      * @param plot      Plot in which the event occurred
      * @param player    Player that was added/removed from the helper list
      * @param added     {@code true} if the player was added, {@code false} if the player was removed
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotAddedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public PlayerPlotHelperEvent(PlotPlayer<?> initiator, Plot plot, UUID player, boolean added) {
         super(plot);
         this.initiator = initiator;
@@ -54,9 +51,7 @@ public class PlayerPlotHelperEvent extends PlotEvent {
      * If a player was added
      *
      * @return boolean
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotAddedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public boolean wasAdded() {
         return this.added;
     }
@@ -65,9 +60,7 @@ public class PlayerPlotHelperEvent extends PlotEvent {
      * The UUID added/removed
      *
      * @return UUID
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotAddedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public UUID getPlayer() {
         return this.player;
     }
@@ -76,9 +69,7 @@ public class PlayerPlotHelperEvent extends PlotEvent {
      * The player initiating the action
      *
      * @return PlotPlayer
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotAddedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public PlotPlayer<?> getInitiator() {
         return this.initiator;
     }

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

@@ -1,45 +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 com.plotsquared.core.plot.Plot;
-
-import java.util.UUID;
-
-/**
- * Called when a player is going to be removed from a plot (could be removed from added, trusted, or denied)
- *
- * @since TODO
- */
-public class PlayerPlotRemoveEvent extends PlayerPlotAddRemoveCancellableEvent {
-
-    /**
-     * Called when a player is going to be removed from a plot (could be removed from added, trusted, or denied)
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that will be removed
-     * @param reason    The reason for the remove
-     */
-    public PlayerPlotRemoveEvent(PlotPlayer<?> initiator, Plot plot, UUID player, Reason reason) {
-        super(initiator, plot, player, reason);
-    }
-
-}

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

@@ -1,45 +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 com.plotsquared.core.plot.Plot;
-
-import java.util.UUID;
-
-/**
- * Called when a player is going to be trusted to a plot
- *
- * @since TODO
- */
-public class PlayerPlotTrustEvent extends PlayerPlotAddRemoveCancellableEvent {
-
-    /**
-     * Called when a player will be trusted to a plot
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that will be trusted
-     * @param reason    The reason for the trust
-     */
-    public PlayerPlotTrustEvent(PlotPlayer<?> initiator, Plot plot, UUID player, Reason reason) {
-        super(initiator, plot, player, reason);
-    }
-
-}

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

@@ -23,10 +23,6 @@ import com.plotsquared.core.plot.Plot;
 
 import java.util.UUID;
 
-/**
- * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotTrustedEvent}
- */
-@Deprecated(forRemoval = true, since = "TODO")
 public class PlayerPlotTrustedEvent extends PlotEvent {
 
     private final PlotPlayer<?> initiator;
@@ -40,9 +36,7 @@ public class PlayerPlotTrustedEvent extends PlotEvent {
      * @param plot      Plot in which the event occurred
      * @param player    Player that was added/removed from the trusted list
      * @param added     {@code true} if the player was added, {@code false} if the player was removed
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotTrustedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public PlayerPlotTrustedEvent(PlotPlayer<?> initiator, Plot plot, UUID player, boolean added) {
         super(plot);
         this.initiator = initiator;
@@ -54,9 +48,7 @@ public class PlayerPlotTrustedEvent extends PlotEvent {
      * If a player was added
      *
      * @return boolean
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotTrustedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public boolean wasAdded() {
         return this.added;
     }
@@ -65,9 +57,7 @@ public class PlayerPlotTrustedEvent extends PlotEvent {
      * The UUID added/removed
      *
      * @return UUID
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotTrustedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public UUID getPlayer() {
         return this.player;
     }
@@ -76,9 +66,7 @@ public class PlayerPlotTrustedEvent extends PlotEvent {
      * The player initiating the action
      *
      * @return PlotPlayer
-     * @deprecated Use {@link com.plotsquared.core.events.post.PostPlayerPlotTrustedEvent}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public PlotPlayer<?> getInitiator() {
         return this.initiator;
     }

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

@@ -1,56 +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.post;
-
-import com.plotsquared.core.events.PlayerPlotAddRemoveEvent;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
-
-import java.util.UUID;
-
-/**
- * Parent class for events covering players being added/removed to added/trusted/denied lists.
- *
- * @since TODO
- */
-public sealed class PostPlayerPlotAddRemoveEvent extends PlayerPlotAddRemoveEvent permits PostPlayerPlotAddedEvent,
-        PostPlayerPlotDeniedEvent, PostPlayerPlotTrustedEvent {
-
-    private final boolean added;
-
-    protected PostPlayerPlotAddRemoveEvent(
-            final PlotPlayer<?> initiator,
-            final Plot plot,
-            final UUID player,
-            final Reason reason,
-            boolean added
-    ) {
-        super(initiator, plot, player, reason);
-        this.added = added;
-    }
-
-    /**
-     * Get if the player was added to a list, or removed.
-     */
-    public boolean added() {
-        return added;
-    }
-
-
-}

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

@@ -1,46 +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.post;
-
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
-
-import java.util.UUID;
-
-/**
- * Called when a player is added to a plot
- *
- * @since TODO
- */
-public final class PostPlayerPlotAddedEvent extends PostPlayerPlotAddRemoveEvent {
-
-    /**
-     * PlayerPlotHelperEvent: Called when a player is added to a plot
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that was added/removed from the helper list
-     * @param added     {@code true} if the player was added, {@code false} if the player was removed
-     * @param reason    The reason for the add/remove
-     */
-    public PostPlayerPlotAddedEvent(PlotPlayer<?> initiator, Plot plot, UUID player, boolean added, Reason reason) {
-        super(initiator, plot, player, reason, added);
-    }
-
-}

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

@@ -1,46 +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.post;
-
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
-
-import java.util.UUID;
-
-/**
- * Called when a player is denied from a plot
- *
- * @since TODO
- */
-public final class PostPlayerPlotDeniedEvent extends PostPlayerPlotAddRemoveEvent {
-
-    /**
-     * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot.
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that was denied/un-denied
-     * @param added     {@code true} of add to deny list, {@code false} if removed
-     * @param reason    The reason for the deny/remove
-     */
-    public PostPlayerPlotDeniedEvent(PlotPlayer<?> initiator, Plot plot, UUID player, boolean added, Reason reason) {
-        super(initiator, plot, player, reason, added);
-    }
-
-}

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

@@ -1,46 +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.post;
-
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
-
-import java.util.UUID;
-
-/**
- * Called when a plot trusted user is added/removed
- *
- * @since TODO
- */
-public final class PostPlayerPlotTrustedEvent extends PostPlayerPlotAddRemoveEvent {
-
-    /**
-     * PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that was added/removed from the trusted list
-     * @param added     {@code true} if the player was added, {@code false} if the player was removed
-     * @param reason    The reason for the trust/remove
-     */
-    public PostPlayerPlotTrustedEvent(PlotPlayer<?> initiator, Plot plot, UUID player, boolean added, Reason reason) {
-        super(initiator, plot, player, reason, added);
-    }
-
-}

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

@@ -140,8 +140,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     @NonNull
     @Override
     protected PlotManager createManager() {
-        return new HybridPlotManager(
+        return new HybridPlotManager(this, PlotSquared.platform().regionManager(),
-                this, PlotSquared.platform().regionManager(),
                 PlotSquared.platform().injector().getInstance(ProgressSubscriberFactory.class)
         );
     }
@@ -216,16 +215,15 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
         // Try to determine root. This means that plot areas can have separate schematic
         // directories
-        String schematicFolder = Settings.Paths.USE_SCHEMATICS_PATH_FOR_GEN_SCHEMATICS ? Settings.Paths.SCHEMATICS : "schematics";
         if (!(root =
                 FileUtils.getFile(
                         PlotSquared.platform().getDirectory(),
-                        schematicFolder + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + this.getWorldName() + File.separator + this.getId()
+                        "schematics/GEN_ROAD_SCHEMATIC/" + this.getWorldName() + "/" + this.getId()
                 ))
                 .exists()) {
             root = FileUtils.getFile(
                     PlotSquared.platform().getDirectory(),
-                    schematicFolder + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + this.getWorldName()
+                    "schematics/GEN_ROAD_SCHEMATIC/" + this.getWorldName()
             );
         }
 

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

@@ -164,7 +164,7 @@ public class PlotListener {
         try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             Plot last = lastPlot.get().orElse(null);
             if ((last != null) && !last.getId().equals(plot.getId())) {
-                plotExit(player, last, plot, plot.getArea());
+                plotExit(player, last);
             }
             if (PlotSquared.platform().expireManager() != null) {
                 PlotSquared.platform().expireManager().handleEntry(player, plot);
@@ -365,12 +365,7 @@ public class PlotListener {
         return true;
     }
 
-    public boolean plotExit(
+    public boolean plotExit(final PlotPlayer<?> player, Plot plot) {
-            final PlotPlayer<?> player,
-            @NonNull Plot plot,
-            @Nullable Plot nextPlot,
-            @Nullable PlotArea nextArea
-    ) {
         try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             final Plot previous = lastPlot.remove();
 
@@ -387,10 +382,8 @@ public class PlotListener {
             if (plot.hasOwner()) {
                 PlotArea pw = plot.getArea();
                 if (pw == null) {
-                    if (nextPlot == null || nextPlot.getArea() == null) {
                     return true;
                 }
-                }
                 try (final MetaDataAccess<Boolean> kickAccess =
                              player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
                     if (plot.getFlag(DenyExitFlag.class) && !player.hasPermission(Permission.PERMISSION_ADMIN_EXIT_DENIED) &&
@@ -447,17 +440,6 @@ public class PlotListener {
                             player.setFlight(value.get());
                             metaDataAccess.remove();
                         } else {
-                            FlyFlag.FlyStatus flight = FlyFlag.FlyStatus.DEFAULT;
-                            if (nextPlot != null) {
-                                flight = nextPlot.getFlag(FlyFlag.class);
-                            } else if (nextArea != null) {
-                                if (nextArea.isRoadFlags()) {
-                                    flight = nextArea.getRoadFlag(FlyFlag.class);
-                                } else {
-                                    flight = nextArea.getFlag(FlyFlag.class);
-                                }
-                            }
-                            if (flight != FlyFlag.FlyStatus.ENABLED) {
                             GameMode gameMode = player.getGameMode();
                             if (gameMode == GameModes.SURVIVAL || gameMode == GameModes.ADVENTURE) {
                                 player.setFlight(false);
@@ -467,7 +449,6 @@ public class PlotListener {
                         }
                     }
                 }
-                }
 
                 if (plot.getFlag(TimeFlag.class) != TimeFlag.TIME_DISABLED.getValue().longValue()) {
                     player.setTime(Long.MAX_VALUE);

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

@@ -290,7 +290,8 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      *
      * @return the plot the player is standing on or null if standing on a road or not in a {@link PlotArea}
      */
-    public @Nullable Plot getCurrentPlot() {
+    @Nullable
+    public Plot getCurrentPlot() {
         try (final MetaDataAccess<Plot> lastPlotAccess =
                      this.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             if (lastPlotAccess.get().orElse(null) == null && !Settings.Enabled_Components.EVENTS) {
@@ -319,7 +320,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      */
     public int getPlotCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getPlotCount(getContextualWorldName());
+            return getPlotCount(getCurrentPlot().getWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         final UUID uuid = getUUID();
@@ -339,7 +340,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     public int getClusterCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getClusterCount(getContextualWorldName());
+            return getClusterCount(getCurrentPlot().getWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         this.plotAreaManager.forEachPlotArea(value -> {
@@ -352,34 +353,6 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
         return count.get();
     }
 
-    /**
-     * {@return the world name at the player's contextual position}
-     * The contextual position can be affected when using a command with
-     * an explicit plot override, e.g., {@code /plot <id> info}.
-     */
-    private @NonNull String getContextualWorldName() {
-        Plot current = getCurrentPlot();
-        if (current != null) {
-            return current.getWorldName();
-        }
-        return getLocation().getWorldName();
-    }
-
-    /**
-     * {@return the plot area at the player's contextual position}
-     * The contextual position can be affected when using a command with
-     * an explicit plot override, e.g., {@code /plot <id> info}.
-     *
-     * @since 7.5.9
-     */
-    public @Nullable PlotArea getContextualPlotArea() {
-        Plot current = getCurrentPlot();
-        if (current != null) {
-            return current.getArea();
-        }
-        return getLocation().getPlotArea();
-    }
-
     /**
      * Get the number of plots this player owns in the world.
      *
@@ -710,8 +683,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     public void populatePersistentMetaMap() {
         if (Settings.Enabled_Components.PERSISTENT_META) {
-            DBFunc.getPersistentMeta(
+            DBFunc.getPersistentMeta(getUUID(), new RunnableVal<>() {
-                    getUUID(), new RunnableVal<>() {
                 @Override
                 public void run(Map<String, byte[]> value) {
                     try {
@@ -860,8 +832,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     }
 
     @SuppressWarnings("unchecked")
-    @Nullable
+    @Nullable <T> T getPersistentMeta(final @NonNull MetaDataKey<T> key) {
-    <T> T getPersistentMeta(final @NonNull MetaDataKey<T> key) {
         final byte[] value = this.getPersistentMeta(key.toString());
         if (value == null) {
             return null;
@@ -1031,11 +1002,9 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
             if (throwable != null) {
                 sendMessage(
                         TranslatableCaption.of("errors.error"),
-                        TagResolver.resolver(
+                        TagResolver.resolver("value", Tag.inserting(
-                                "value", Tag.inserting(
                                 Component.text("Failed to resolve asynchronous caption replacements")
-                                )
+                        ))
-                        )
                 );
                 LOGGER.error("Failed to resolve asynchronous tagresolver(s) for " + caption, throwable);
             } else {

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.PlayerPlotAddRemoveEvent;
 import com.plotsquared.core.events.PlayerTeleportToPlotEvent;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.events.TeleportCause;
@@ -542,7 +541,7 @@ public class Plot {
      *
      * @return World name
      */
-    public @NonNull String getWorldName() {
+    public @Nullable String getWorldName() {
         return area.getWorldName();
     }
 
@@ -975,10 +974,7 @@ public class Plot {
      * Sets the denied users for this plot.
      *
      * @param uuids uuids to deny
-     * @deprecated Use {@link Plot#addDenied(UUID)} (UUID)} calling
-     *         {@link EventDispatcher#callPlayerDeny(PlotPlayer, Plot, UUID, PlayerPlotAddRemoveEvent.Reason)} for each.
      */
-    @Deprecated
     public void setDenied(final @NonNull Set<UUID> uuids) {
         boolean larger = uuids.size() > getDenied().size();
         HashSet<UUID> intersection;
@@ -1019,10 +1015,7 @@ public class Plot {
      * Sets the trusted users for this plot.
      *
      * @param uuids uuids to trust
-     * @deprecated Use {@link Plot#addTrusted(UUID)} calling
-     *         {@link EventDispatcher#callPlayerTrust(PlotPlayer, Plot, UUID, PlayerPlotAddRemoveEvent.Reason)} for each.
      */
-    @Deprecated
     public void setTrusted(final @NonNull Set<UUID> uuids) {
         boolean larger = uuids.size() > getTrusted().size();
         HashSet<UUID> intersection = new HashSet<>(larger ? getTrusted() : uuids);
@@ -1054,10 +1047,7 @@ public class Plot {
      * Sets the members for this plot.
      *
      * @param uuids uuids to set member status for
-     * @deprecated Use {@link Plot#addMember(UUID)} (UUID)} (UUID)} calling
-     *         {@link EventDispatcher#callPlayerAdd(PlotPlayer, Plot, UUID, PlayerPlotAddRemoveEvent.Reason)} for each.
      */
-    @Deprecated
     public void setMembers(final @NonNull Set<UUID> uuids) {
         boolean larger = uuids.size() > getMembers().size();
         HashSet<UUID> intersection = new HashSet<>(larger ? getMembers() : uuids);
@@ -1350,7 +1340,7 @@ public class Plot {
         for (Plot current : getConnectedPlots()) {
             List<PlotPlayer<?>> players = current.getPlayersInPlot();
             for (PlotPlayer<?> pp : players) {
-                this.plotListener.plotExit(pp, current, null, area);
+                this.plotListener.plotExit(pp, current);
             }
 
             if (Settings.Backup.DELETE_ON_UNCLAIM) {
@@ -2312,53 +2302,23 @@ public class Plot {
             this.setAlias(plot.getAlias());
         }
         for (UUID uuid : this.getTrusted()) {
-            if (eventDispatcher
-                    .callPlayerTrust(null, plot, uuid, PlayerPlotAddRemoveEvent.Reason.MERGE)
-                    .getEventResult() != Result.DENY) {
             plot.addTrusted(uuid);
-                eventDispatcher.callPostTrusted(null, plot, uuid, true, PlayerPlotAddRemoveEvent.Reason.MERGE);
-            }
         }
         for (UUID uuid : plot.getTrusted()) {
-            if (eventDispatcher
-                    .callPlayerTrust(null, this, uuid, PlayerPlotAddRemoveEvent.Reason.MERGE)
-                    .getEventResult() != Result.DENY) {
             this.addTrusted(uuid);
-                eventDispatcher.callPostTrusted(null, this, uuid, true, PlayerPlotAddRemoveEvent.Reason.MERGE);
-            }
         }
         for (UUID uuid : this.getMembers()) {
-            if (eventDispatcher
-                    .callPlayerAdd(null, plot, uuid, PlayerPlotAddRemoveEvent.Reason.MERGE)
-                    .getEventResult() != Result.DENY) {
             plot.addMember(uuid);
-                eventDispatcher.callPostAdded(null, plot, uuid, true, PlayerPlotAddRemoveEvent.Reason.MERGE);
-            }
         }
         for (UUID uuid : plot.getMembers()) {
-            if (eventDispatcher
-                    .callPlayerAdd(null, this, uuid, PlayerPlotAddRemoveEvent.Reason.MERGE)
-                    .getEventResult() != Result.DENY) {
             this.addMember(uuid);
-                eventDispatcher.callPostAdded(null, this, uuid, true, PlayerPlotAddRemoveEvent.Reason.MERGE);
-            }
         }
 
         for (UUID uuid : this.getDenied()) {
-            if (eventDispatcher
-                    .callPlayerDeny(null, plot, uuid, PlayerPlotAddRemoveEvent.Reason.MERGE)
-                    .getEventResult() != Result.DENY) {
             plot.addDenied(uuid);
-                eventDispatcher.callPostDenied(null, plot, uuid, true, PlayerPlotAddRemoveEvent.Reason.MERGE);
-            }
         }
         for (UUID uuid : plot.getDenied()) {
-            if (eventDispatcher
-                    .callPlayerDeny(null, this, uuid, PlayerPlotAddRemoveEvent.Reason.MERGE)
-                    .getEventResult() != Result.DENY) {
             this.addDenied(uuid);
-                eventDispatcher.callPostDenied(null, this, uuid, true, PlayerPlotAddRemoveEvent.Reason.MERGE);
-            }
         }
     }
 
@@ -2634,7 +2594,7 @@ public class Plot {
     public void reEnter() {
         TaskManager.runTaskLater(() -> {
             for (PlotPlayer<?> pp : Plot.this.getPlayersInPlot()) {
-                this.plotListener.plotExit(pp, Plot.this, Plot.this, area);
+                this.plotListener.plotExit(pp, Plot.this);
                 this.plotListener.plotEntry(pp, Plot.this);
             }
         }, TaskTime.ticks(1L));

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

@@ -21,7 +21,6 @@ package com.plotsquared.core.plot;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
-import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.collection.QuadMap;
 import com.plotsquared.core.configuration.ConfigurationNode;
@@ -30,8 +29,6 @@ import com.plotsquared.core.configuration.ConfigurationUtil;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.configuration.file.YamlConfiguration;
-import com.plotsquared.core.events.PlayerPlotAddRemoveEvent;
-import com.plotsquared.core.events.Result;
 import com.plotsquared.core.generator.GridPlotWorld;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.inject.annotations.WorldConfig;
@@ -50,7 +47,6 @@ import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.queue.GlobalBlockQueue;
 import com.plotsquared.core.queue.QueueCoordinator;
-import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.PlotExpression;
 import com.plotsquared.core.util.RegionUtil;
@@ -159,9 +155,6 @@ public abstract class PlotArea implements ComponentLike {
     private QuadMap<PlotCluster> clusters;
     private String signMaterial = "OAK_WALL_SIGN";
     private String legacySignMaterial = "WALL_SIGN";
-    // These will be injected
-    @Inject
-    private EventDispatcher eventDispatcher;
 
     public PlotArea(
             final @NonNull String worldName, final @Nullable String id,
@@ -1111,44 +1104,9 @@ public abstract class PlotArea implements ComponentLike {
                 final PlotId id = PlotId.of(x, y);
                 final Plot plot = getPlotAbs(id);
 
-                Set<UUID> currentlyTrusted = plot.getTrusted();
+                plot.setTrusted(trusted);
-                trusted.forEach(uuid -> {
+                plot.setMembers(members);
-                    if (!currentlyTrusted.contains(uuid) && eventDispatcher.callPlayerTrust(
+                plot.setDenied(denied);
-                            null,
-                            plot,
-                            uuid,
-                            PlayerPlotAddRemoveEvent.Reason.MERGE
-                    ).getEventResult() != Result.DENY) {
-                        plot.addTrusted(uuid);
-                        eventDispatcher.callPostTrusted(null, plot, uuid, true, PlayerPlotAddRemoveEvent.Reason.MERGE);
-                    }
-                });
-
-                Set<UUID> currentlyAdded = plot.getMembers();
-                members.forEach(uuid -> {
-                    if (!currentlyAdded.contains(uuid) && eventDispatcher.callPlayerAdd(
-                            null,
-                            plot,
-                            uuid,
-                            PlayerPlotAddRemoveEvent.Reason.MERGE
-                    ).getEventResult() != Result.DENY) {
-                        plot.addMember(uuid);
-                        eventDispatcher.callPostAdded(null, plot, uuid, true, PlayerPlotAddRemoveEvent.Reason.MERGE);
-                    }
-                });
-
-                Set<UUID> currentlyDenied = plot.getDenied();
-                denied.forEach(uuid -> {
-                    if (!currentlyDenied.contains(uuid) && eventDispatcher.callPlayerDeny(
-                            null,
-                            plot,
-                            uuid,
-                            PlayerPlotAddRemoveEvent.Reason.MERGE
-                    ).getEventResult() != Result.DENY) {
-                        plot.addDenied(uuid);
-                        eventDispatcher.callPostDenied(null, plot, uuid, true, PlayerPlotAddRemoveEvent.Reason.MERGE);
-                    }
-                });
 
                 Plot plot2;
                 if (lx) {

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

@@ -58,7 +58,7 @@ public class SinglePlot extends Plot {
     }
 
     @Override
-    public @NonNull String getWorldName() {
+    public String getWorldName() {
         return getId().toUnderscoreSeparatedString();
     }
 

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

@@ -29,14 +29,9 @@ import com.plotsquared.core.events.PlayerBuyPlotEvent;
 import com.plotsquared.core.events.PlayerClaimPlotEvent;
 import com.plotsquared.core.events.PlayerEnterPlotEvent;
 import com.plotsquared.core.events.PlayerLeavePlotEvent;
-import com.plotsquared.core.events.PlayerPlotAddEvent;
-import com.plotsquared.core.events.PlayerPlotAddRemoveEvent;
 import com.plotsquared.core.events.PlayerPlotDeniedEvent;
-import com.plotsquared.core.events.PlayerPlotDenyEvent;
 import com.plotsquared.core.events.PlayerPlotHelperEvent;
 import com.plotsquared.core.events.PlayerPlotLimitEvent;
-import com.plotsquared.core.events.PlayerPlotRemoveEvent;
-import com.plotsquared.core.events.PlayerPlotTrustEvent;
 import com.plotsquared.core.events.PlayerPlotTrustedEvent;
 import com.plotsquared.core.events.PlayerTeleportToPlotEvent;
 import com.plotsquared.core.events.PlotAutoMergeEvent;
@@ -56,9 +51,6 @@ import com.plotsquared.core.events.RemoveRoadEntityEvent;
 import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.events.post.PostPlayerAutoPlotEvent;
 import com.plotsquared.core.events.post.PostPlayerBuyPlotEvent;
-import com.plotsquared.core.events.post.PostPlayerPlotAddedEvent;
-import com.plotsquared.core.events.post.PostPlayerPlotDeniedEvent;
-import com.plotsquared.core.events.post.PostPlayerPlotTrustedEvent;
 import com.plotsquared.core.events.post.PostPlotChangeOwnerEvent;
 import com.plotsquared.core.events.post.PostPlotClearEvent;
 import com.plotsquared.core.events.post.PostPlotDeleteEvent;
@@ -266,7 +258,6 @@ public class EventDispatcher {
         return event;
     }
 
-    @Deprecated(forRemoval = true, since = "TODO")
     public PlayerPlotDeniedEvent callDenied(
             PlotPlayer<?> initiator, Plot plot, UUID player,
             boolean added
@@ -276,7 +267,6 @@ public class EventDispatcher {
         return event;
     }
 
-    @Deprecated(forRemoval = true, since = "TODO")
     public PlayerPlotTrustedEvent callTrusted(
             PlotPlayer<?> initiator, Plot plot, UUID player,
             boolean added
@@ -286,7 +276,6 @@ public class EventDispatcher {
         return event;
     }
 
-    @Deprecated(forRemoval = true, since = "TODO")
     public PlayerPlotHelperEvent callMember(
             PlotPlayer<?> initiator, Plot plot, UUID player,
             boolean added
@@ -296,62 +285,6 @@ public class EventDispatcher {
         return event;
     }
 
-    public PostPlayerPlotDeniedEvent callPostDenied(
-            PlotPlayer<?> initiator, Plot plot, UUID player, boolean added, PlayerPlotAddRemoveEvent.Reason reason
-    ) {
-        PostPlayerPlotDeniedEvent event = new PostPlayerPlotDeniedEvent(initiator, plot, player, added, reason);
-        callEvent(event);
-        return event;
-    }
-
-    public PostPlayerPlotTrustedEvent callPostTrusted(
-            PlotPlayer<?> initiator, Plot plot, UUID player, boolean added, PlayerPlotAddRemoveEvent.Reason reason
-    ) {
-        PostPlayerPlotTrustedEvent event = new PostPlayerPlotTrustedEvent(initiator, plot, player, added, reason);
-        callEvent(event);
-        return event;
-    }
-
-    public PostPlayerPlotAddedEvent callPostAdded(
-            PlotPlayer<?> initiator, Plot plot, UUID player, boolean added, PlayerPlotAddRemoveEvent.Reason reason
-    ) {
-        PostPlayerPlotAddedEvent event = new PostPlayerPlotAddedEvent(initiator, plot, player, added, reason);
-        callEvent(event);
-        return event;
-    }
-
-    public PlayerPlotDenyEvent callPlayerDeny(
-            PlotPlayer<?> initiator, Plot plot, UUID player, PlayerPlotAddRemoveEvent.Reason reason
-    ) {
-        PlayerPlotDenyEvent event = new PlayerPlotDenyEvent(initiator, plot, player, reason);
-        callEvent(event);
-        return event;
-    }
-
-    public PlayerPlotTrustEvent callPlayerTrust(
-            PlotPlayer<?> initiator, Plot plot, UUID player, PlayerPlotAddRemoveEvent.Reason reason
-    ) {
-        PlayerPlotTrustEvent event = new PlayerPlotTrustEvent(initiator, plot, player, reason);
-        callEvent(event);
-        return event;
-    }
-
-    public PlayerPlotAddEvent callPlayerAdd(
-            PlotPlayer<?> initiator, Plot plot, UUID player, PlayerPlotAddRemoveEvent.Reason reason
-    ) {
-        PlayerPlotAddEvent event = new PlayerPlotAddEvent(initiator, plot, player, reason);
-        callEvent(event);
-        return event;
-    }
-
-    public PlayerPlotRemoveEvent callPlayerRemove(
-            PlotPlayer<?> initiator, Plot plot, UUID player, PlayerPlotAddRemoveEvent.Reason reason
-    ) {
-        PlayerPlotRemoveEvent event = new PlayerPlotRemoveEvent(initiator, plot, player, reason);
-        callEvent(event);
-        return event;
-    }
-
     public PlotChangeOwnerEvent callOwnerChange(
             PlotPlayer<?> initiator, Plot plot, UUID oldOwner,
             UUID newOwner, boolean hasOldOwner

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

@@ -204,9 +204,6 @@ public final class PlaceholderRegistry {
         this.createPlaceholder("currentplot_x", (player, plot) -> Integer.toString(plot.getId().getX()));
         this.createPlaceholder("currentplot_y", (player, plot) -> Integer.toString(plot.getId().getY()));
         this.createPlaceholder("currentplot_xy", (player, plot) -> plot.getId().toString());
-        this.createPlaceholder("currentplot_abs_x", (player, plot) -> Integer.toString(plot.getId().getX()), true);
-        this.createPlaceholder("currentplot_abs_y", (player, plot) -> Integer.toString(plot.getId().getY()), true);
-        this.createPlaceholder("currentplot_abs_xy", (player, plot) -> plot.getId().toString(), true);
         this.createPlaceholder("currentplot_rating", (player, plot) -> {
             if (Double.isNaN(plot.getAverageRating())) {
                 return legacyComponent(TranslatableCaption.of("placeholder.nan"), player);
@@ -256,23 +253,7 @@ public final class PlaceholderRegistry {
             final @NonNull String key,
             final @NonNull BiFunction<PlotPlayer<?>, Plot, String> placeholderFunction
     ) {
-        this.createPlaceholder(key, placeholderFunction, false);
+        this.registerPlaceholder(new PlotSpecificPlaceholder(key) {
-    }
-
-    /**
-     * Create a functional placeholder
-     *
-     * @param key                 Placeholder key
-     * @param placeholderFunction Placeholder generator. Cannot return null
-     * @param requireAbsolute     If the plot given to the placeholder should be the absolute (not base) plot
-     * @since 7.5.9
-     */
-    public void createPlaceholder(
-            final @NonNull String key,
-            final @NonNull BiFunction<PlotPlayer<?>, Plot, String> placeholderFunction,
-            final boolean requireAbsolute
-    ) {
-        this.registerPlaceholder(new PlotSpecificPlaceholder(key, requireAbsolute) {
             @Override
             public @NonNull String getValue(final @NonNull PlotPlayer<?> player, final @NonNull Plot plot) {
                 return placeholderFunction.apply(player, plot);

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

@@ -27,28 +27,14 @@ import org.checkerframework.checker.nullness.qual.NonNull;
  */
 public abstract class PlotSpecificPlaceholder extends Placeholder {
 
-    private final boolean requireAbsolute;
-
     public PlotSpecificPlaceholder(final @NonNull String key) {
-        this(key, false);
-    }
-
-    /**
-     * Create a functional placeholder
-     *
-     * @param key             Placeholder key
-     * @param requireAbsolute If the plot given to the placeholder should be the absolute (not base) plot
-     * @since 7.5.9
-     */
-    public PlotSpecificPlaceholder(final @NonNull String key, final boolean requireAbsolute) {
         super(key);
-        this.requireAbsolute = requireAbsolute;
     }
 
     @Override
     public @NonNull
     final String getValue(final @NonNull PlotPlayer<?> player) {
-        final Plot plot = requireAbsolute ? player.getLocation().getPlotAbs() : player.getCurrentPlot();
+        final Plot plot = player.getCurrentPlot();
         if (plot == null) {
             return "";
         }

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.12-SNAPSHOT"
+version = "7.5.8-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -65,16 +65,10 @@ subprojects {
         plugin<IdeaPlugin>()
     }
 
-    configurations.matching { it.name == "signatures" }.configureEach {
-        attributes {
-            attribute(Attribute.of("signatures-unique", String::class.java), "true")
-        }
-    }
-
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:6.0.1")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.13.4")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.1")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
     }
 
     plugins.withId("java") {
@@ -101,16 +95,10 @@ subprojects {
         }
     }
 
-    afterEvaluate {
     val javaComponent = components["java"] as AdhocComponentWithVariants
-        configurations.findByName("shadowRuntimeElements")?.let { shadowRuntimeElements ->
+    javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
-            javaComponent.withVariantsFromConfiguration(shadowRuntimeElements) {
         skip()
     }
-        } ?: run {
-            logger.warn("Configuration 'shadowRuntimeElements' does not exist.")
-        }
-    }
 
     signing {
         if (!project.hasProperty("skip.signing") && !version.toString().endsWith("-SNAPSHOT")) {
@@ -231,10 +219,9 @@ tasks {
         register<RunServer>("runServer-$it") {
             dependsOn(getByName("cacheLatestFaweArtifact"))
             minecraftVersion(it)
-            pluginJars(project.files(
+            pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false)
-                project(":plotsquared-bukkit").tasks.named<Jar>("shadowJar")
+                    .map { task -> (task as Jar).archiveFile }
-                .map { it.archiveFile }
+                    .toTypedArray())
-            ))
             jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
             downloadPlugins {
                 url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/${project.ext["faweArtifact"]}")

gradle/libs.versions.toml

@@ -2,19 +2,19 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.9.8"
+spotbugs = "4.9.4"
-checkerqual = "3.52.1"
+checkerqual = "3.51.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.26.1"
+adventure = "4.24.0"
 adventure-bukkit = "4.4.1"
 log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.20"
-fawe = "2.14.3"
+fawe = "2.13.2"
-placeholderapi = "2.11.7"
+placeholderapi = "2.11.6"
 luckperms = "5.5"
 essentialsx = "2.21.2"
 mvdwapi = "3.1.1"
@@ -33,11 +33,11 @@ vault = "1.7.1"
 serverlib = "2.3.7"
 
 # Gradle plugins
-shadow = "9.3.0"
+shadow = "8.3.9"
 grgit = "4.1.1"
-spotless = "8.1.0"
+spotless = "7.2.1"
-publish = "0.35.0"
+publish = "0.34.0"
-runPaper = "3.0.2"
+runPaper = "2.3.1"
 
 [libraries]
 # Platform expectations

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,6 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,10 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell