Release 7.5.7

Signed-off-by: Alexander Brandes <mc.cache@web.de>
Update dependency org.checkerframework:checker-qual to v3.50.0 (#4749 )
2025-09-10 06:45:35 +02:00 · 2025-09-09 21:55:30 +02:00 · 2025-09-08 01:36:33 +00:00 · 2025-09-08 01:36:15 +00:00 · 2025-09-01 20:29:52 +02:00 · 2025-08-30 20:33:13 +02:00
55 changed files with 291 additions and 1000 deletions
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -9,11 +9,11 @@ jobs:
        os: [ ubuntu-latest, windows-latest, macos-latest ]
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
      - name: Validate Gradle Wrapper
        uses: gradle/actions/wrapper-validation@v4
      - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: temurin
          java-version: 21
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,11 +9,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
      - name: Validate Gradle Wrapper
        uses: gradle/actions/wrapper-validation@v4
      - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: temurin
          java-version: 21
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -20,9 +20,9 @@ jobs:
        language: [ 'java' ]
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
      - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: temurin
          java-version: 21
--- a/Core/src/main/java/com/plotsquared/core/backup/Backup.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/Backup.java
@@ -18,6 +18,8 @@
 */
 package com.plotsquared.core.backup;

+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.Nullable;

 import java.io.IOException;
@@ -30,12 +32,14 @@ import java.nio.file.Path;
 */
 public class Backup {

+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Backup.class.getSimpleName());
+
    private final BackupProfile owner;
    private final long creationTime;
    @Nullable
    private final Path file;

-    Backup(final BackupProfile owner, final long creationTime, final Path file) {
+    Backup(final BackupProfile owner, final long creationTime, @Nullable final Path file) {
        this.owner = owner;
        this.creationTime = creationTime;
        this.file = file;
@@ -49,7 +53,7 @@ public class Backup {
            try {
                Files.deleteIfExists(file);
            } catch (final IOException e) {
-                e.printStackTrace();
+                LOGGER.error("Error deleting backup at {}", file, e);
            }
        }
    }
--- a/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/PlayerBackupProfile.java
@@ -21,14 +21,15 @@ package com.plotsquared.core.backup;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.player.ConsolePlayer;
+import com.plotsquared.core.exception.PlotSquaredException;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.schematic.Schematic;
 import com.plotsquared.core.util.SchematicHandler;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.TaskManager;
-import net.kyori.adventure.text.minimessage.MiniMessage;
+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;

@@ -51,7 +52,7 @@ import java.util.concurrent.CompletableFuture;
 */
 public class PlayerBackupProfile implements BackupProfile {

-    static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlayerBackupProfile.class.getSimpleName());

    private final UUID owner;
    private final Plot plot;
@@ -87,7 +88,7 @@ public class PlayerBackupProfile implements BackupProfile {
                Files.createDirectory(path);
            }
        } catch (final Exception e) {
-            e.printStackTrace();
+            LOGGER.error("Error resolving {} from {}", child, parent, e);
        }
        return path;
    }
@@ -104,7 +105,7 @@ public class PlayerBackupProfile implements BackupProfile {
                    try {
                        Files.createDirectories(path);
                    } catch (IOException e) {
-                        e.printStackTrace();
+                        LOGGER.error("Error creating directory {}", path, e);
                        return Collections.emptyList();
                    }
                }
@@ -117,11 +118,11 @@ public class PlayerBackupProfile implements BackupProfile {
                            backups.add(
                                    new Backup(this, basicFileAttributes.creationTime().toMillis(), file));
                        } catch (IOException e) {
-                            e.printStackTrace();
+                            LOGGER.error("Error getting attributes for file {} to create backup", file, e);
                        }
                    });
                } catch (IOException e) {
-                    e.printStackTrace();
+                    LOGGER.error("Error walking files from {}", path, e);
                }
                backups.sort(Comparator.comparingLong(Backup::getCreationTime).reversed());
                return (this.backupCache = backups);
@@ -133,7 +134,7 @@ public class PlayerBackupProfile implements BackupProfile {
    public void destroy() {
        this.listBackups().whenCompleteAsync((backups, error) -> {
            if (error != null) {
-                error.printStackTrace();
+                LOGGER.error("Error while listing backups", error);
            }
            backups.forEach(Backup::delete);
            this.backupCache = null;
@@ -141,10 +142,12 @@ public class PlayerBackupProfile implements BackupProfile {
    }

    public @NonNull Path getBackupDirectory() {
-        return resolve(resolve(
-                resolve(backupManager.getBackupPath(), Objects.requireNonNull(plot.getArea().toString(), "plot area id")),
-                Objects.requireNonNull(plot.getId().toDashSeparatedString(), "plot id")
-        ), Objects.requireNonNull(owner.toString(), "owner"));
+        return resolve(
+                resolve(
+                        resolve(backupManager.getBackupPath(), Objects.requireNonNull(plot.getArea().toString(), "plot area id")),
+                        Objects.requireNonNull(plot.getId().toDashSeparatedString(), "plot id")
+                ), Objects.requireNonNull(owner.toString(), "owner")
+        );
    }

    @Override
@@ -156,7 +159,8 @@ public class PlayerBackupProfile implements BackupProfile {
                    backups.get(backups.size() - 1).delete();
                }
                final List<Plot> plots = Collections.singletonList(plot);
-                final boolean result = this.schematicHandler.exportAll(plots, getBackupDirectory().toFile(),
+                final boolean result = this.schematicHandler.exportAll(
+                        plots, getBackupDirectory().toFile(),
                        "%world%-%id%-" + System.currentTimeMillis(), () ->
                                future.complete(new Backup(this, System.currentTimeMillis(), null))
                );
@@ -180,7 +184,7 @@ public class PlayerBackupProfile implements BackupProfile {
                try {
                    schematic = this.schematicHandler.getSchematic(backup.getFile().toFile());
                } catch (SchematicHandler.UnsupportedFormatException e) {
-                    e.printStackTrace();
+                    LOGGER.error("Unsupported format for backup {}", backup.getFile(), e);
                }
                if (schematic == null) {
                    future.completeExceptionally(new IllegalArgumentException(
@@ -200,10 +204,9 @@ public class PlayerBackupProfile implements BackupProfile {
                                    if (value) {
                                        future.complete(null);
                                    } else {
-                                        future.completeExceptionally(new RuntimeException(MINI_MESSAGE.escapeTags(
+                                        future.completeExceptionally(new PlotSquaredException(
                                                TranslatableCaption
-                                                        .of("schematics.schematic_paste_failed")
-                                                        .getComponent(ConsolePlayer.getConsole()))));
+                                                        .of("schematics.schematic_paste_failed")));
                                    }
                                }
                            }
--- a/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
+++ b/Core/src/main/java/com/plotsquared/core/backup/SimpleBackupManager.java
@@ -32,6 +32,8 @@ import com.plotsquared.core.util.task.TaskManager;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+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;

@@ -47,6 +49,7 @@ import java.util.concurrent.TimeUnit;
@Singleton
 public class SimpleBackupManager implements BackupManager {

+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SimpleBackupManager.class.getSimpleName());
    private final Path backupPath;
    private final boolean automaticBackup;
    private final int backupLimit;
@@ -112,7 +115,12 @@ public class SimpleBackupManager implements BackupManager {
                                TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
                        );
                    }
-                    throwable.printStackTrace();
+                    LOGGER.error(
+                            "Error creating backup for plot {};{} and player {}",
+                            plot.getArea(),
+                            plot.getId(),
+                            player == null ? "null" : player.getName(), throwable
+                    );
                } else {
                    if (player != null) {
                        player.sendMessage(TranslatableCaption.of("backups.backup_automatic_finished"));
@@ -128,6 +136,7 @@ public class SimpleBackupManager implements BackupManager {
        return this.automaticBackup;
    }

+    @NonNull
    public Path getBackupPath() {
        return this.backupPath;
    }
--- a/Core/src/main/java/com/plotsquared/core/command/Add.java
+++ b/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,41 +151,20 @@ public class Add extends Command {
                        return;
                    }
                    // Success
-                    confirm.run(
-                            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;
+                    confirm.run(this, () -> {
+                        for (UUID uuid : uuids) {
+                            if (uuid != DBFunc.EVERYONE) {
+                                if (!plot.removeTrusted(uuid)) {
+                                    if (plot.getDenied().contains(uuid)) {
+                                        plot.removeDenied(uuid);
                                    }
-                                    if (uuid != DBFunc.EVERYONE) {
-                                        if (!plot.removeTrusted(uuid)) {
-                                            if (plot.getDenied().contains(uuid)) {
-                                                plot.removeDenied(uuid);
-                                            }
-                                        }
-                                    }
-                                    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
-                    );
+                            }
+                            plot.addMember(uuid);
+                            this.eventDispatcher.callMember(player, plot, uuid, true);
+                            player.sendMessage(TranslatableCaption.of("member.member_added"));
+                        }
+                    }, null);
                } catch (final Throwable exception) {
                    future.completeExceptionally(exception);
                    return;
--- a/Core/src/main/java/com/plotsquared/core/command/Alias.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Alias.java
@@ -21,7 +21,6 @@ package com.plotsquared.core.command;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -58,8 +57,7 @@ public class Alias extends SubCommand {
            return false;
        }

-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
--- a/Core/src/main/java/com/plotsquared/core/command/Backup.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Backup.java
@@ -24,6 +24,7 @@ import com.plotsquared.core.backup.BackupProfile;
 import com.plotsquared.core.backup.NullBackupProfile;
 import com.plotsquared.core.backup.PlayerBackupProfile;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.exception.PlotSquaredException;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -32,6 +33,8 @@ import com.plotsquared.core.util.task.RunnableVal3;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;

 import java.nio.file.Files;
@@ -57,6 +60,8 @@ import java.util.stream.Stream;
        permission = "plots.backup")
 public final class Backup extends Command {

+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Backup.class.getSimpleName());
+
    private final BackupManager backupManager;

    @Inject
@@ -326,20 +331,43 @@ public final class Backup extends Command {
            if (backupProfile instanceof NullBackupProfile) {
                player.sendMessage(
                        TranslatableCaption.of("backups.backup_impossible"),
-                        TagResolver.resolver("plot", Tag.inserting(
-                                TranslatableCaption.of("generic.generic_other").toComponent(player)
-                        ))
+                        TagResolver.resolver(
+                                "plot", Tag.inserting(
+                                        TranslatableCaption.of("generic.generic_other").toComponent(player)
+                                )
+                        )
                );
            } else {
                backupProfile.listBackups().whenComplete((backups, throwable) -> {
                    if (throwable != null) {
+                        Component reason;
+                        if (throwable instanceof PlotSquaredException pe) {
+                            reason = pe.getCaption().toComponent(player);
+                        } else {
+                            reason = Component.text(throwable.getMessage());
+                        }
                        player.sendMessage(
                                TranslatableCaption.of("backups.backup_load_failure"),
-                                TagResolver.resolver("reason", Tag.inserting(Component.text(throwable.getMessage())))
+                                TagResolver.resolver("reason", Tag.inserting(reason))
+                        );
+                        LOGGER.error("Error loading player ({}) backup", player.getName(), throwable);
+                        return;
+                    }
+                    if (number < 1 || number > backups.size()) {
+                        player.sendMessage(
+                                TranslatableCaption.of("backups.backup_impossible"),
+                                TagResolver.resolver(
+                                        "plot",
+                                        Tag.inserting(TranslatableCaption
+                                                .of("generic.generic_invalid_choice")
+                                                .toComponent(player))
+                                )
                        );
-                        throwable.printStackTrace();
                    } else {
-                        if (number < 1 || number > backups.size()) {
+                        final com.plotsquared.core.backup.Backup backup =
+                                backups.get(number - 1);
+                        if (backup == null || backup.getFile() == null || !Files
+                                .exists(backup.getFile())) {
                            player.sendMessage(
                                    TranslatableCaption.of("backups.backup_impossible"),
                                    TagResolver.resolver(
@@ -350,37 +378,23 @@ public final class Backup extends Command {
                                    )
                            );
                        } else {
-                            final com.plotsquared.core.backup.Backup backup =
-                                    backups.get(number - 1);
-                            if (backup == null || backup.getFile() == null || !Files
-                                    .exists(backup.getFile())) {
-                                player.sendMessage(
-                                        TranslatableCaption.of("backups.backup_impossible"),
-                                        TagResolver.resolver(
-                                                "plot",
-                                                Tag.inserting(TranslatableCaption
-                                                        .of("generic.generic_invalid_choice")
-                                                        .toComponent(player))
-                                        )
-                                );
-                            } else {
-                                CmdConfirm.addPending(player, "/plot backup load " + number,
-                                        () -> backupProfile.restoreBackup(backup, player)
-                                                .whenComplete((n, error) -> {
-                                                    if (error != null) {
-                                                        player.sendMessage(
-                                                                TranslatableCaption.of("backups.backup_load_failure"),
-                                                                TagResolver.resolver(
-                                                                        "reason",
-                                                                        Tag.inserting(Component.text(error.getMessage()))
-                                                                )
-                                                        );
-                                                    } else {
-                                                        player.sendMessage(TranslatableCaption.of("backups.backup_load_success"));
-                                                    }
-                                                })
-                                );
-                            }
+                            CmdConfirm.addPending(
+                                    player, "/plot backup load " + number,
+                                    () -> backupProfile.restoreBackup(backup, player)
+                                            .whenComplete((n, error) -> {
+                                                if (error != null) {
+                                                    player.sendMessage(
+                                                            TranslatableCaption.of("backups.backup_load_failure"),
+                                                            TagResolver.resolver(
+                                                                    "reason",
+                                                                    Tag.inserting(Component.text(error.getMessage()))
+                                                            )
+                                                    );
+                                                } else {
+                                                    player.sendMessage(TranslatableCaption.of("backups.backup_load_success"));
+                                                }
+                                            })
+                            );
                        }
                    }
                });
--- a/Core/src/main/java/com/plotsquared/core/command/Buy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Buy.java
@@ -20,6 +20,7 @@ package com.plotsquared.core.command;

 import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
+import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlayerBuyPlotEvent;
 import com.plotsquared.core.events.Result;
@@ -84,8 +85,9 @@ public class Buy extends Command {
        checkTrue(plot.hasOwner(), TranslatableCaption.of("info.plot_unowned"));
        checkTrue(!plot.isOwner(player.getUUID()), TranslatableCaption.of("economy.cannot_buy_own"));
        Set<Plot> plots = plot.getConnectedPlots();
+        int plotCount = Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plot.getWorldName());
        checkTrue(
-                player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
+                plotCount + plots.size() <= player.getAllowedPlots(),
                TranslatableCaption.of("permission.cant_claim_more_plots"),
                TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
        );
--- a/Core/src/main/java/com/plotsquared/core/command/Claim.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Claim.java
@@ -26,7 +26,6 @@ import com.plotsquared.core.events.PlayerClaimPlotEvent;
 import com.plotsquared.core.events.PlotMergeEvent;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.location.Direction;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.MetaDataAccess;
 import com.plotsquared.core.player.PlayerMetaDataKeys;
@@ -72,8 +71,7 @@ public class Claim extends SubCommand {
        if (args.length >= 1) {
            schematic = args[0];
        }
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
@@ -90,7 +88,7 @@ public class Claim extends SubCommand {
        boolean force = event.getEventResult() == Result.FORCE;
        int currentPlots = Settings.Limit.GLOBAL ?
                player.getPlotCount() :
-                player.getPlotCount(location.getWorldName());
+                player.getPlotCount(plot.getWorldName());

        final PlotArea area = plot.getArea();

--- a/Core/src/main/java/com/plotsquared/core/command/Continue.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Continue.java
@@ -68,8 +68,8 @@ public class Continue extends SubCommand {
            return false;
        }
        int size = plot.getConnectedPlots().size();
-        if (!Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots()
-                < player.getPlotCount() + size)) {
+        int plotCount = Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plot.getWorldName());
+        if (!Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots() < plotCount + size)) {
            player.sendMessage(
                    TranslatableCaption.of("permission.cant_claim_more_plots"),
                    TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
--- a/Core/src/main/java/com/plotsquared/core/command/Copy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java
@@ -19,7 +19,6 @@
 package com.plotsquared.core.command;

 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -37,8 +36,7 @@ public class Copy extends SubCommand {

    @Override
    public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        Plot plot1 = location.getPlotAbs();
+        Plot plot1 = player.getCurrentPlot();
        if (plot1 == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
--- a/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
+++ b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java
@@ -22,7 +22,6 @@ import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.generator.HybridPlotWorld;
 import com.plotsquared.core.generator.HybridUtils;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import net.kyori.adventure.text.Component;
@@ -47,8 +46,7 @@ public class CreateRoadSchematic extends SubCommand {

    @Override
    public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
@@ -57,7 +55,7 @@ public class CreateRoadSchematic extends SubCommand {
            player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
            return false;
        }
-        if (!(location.getPlotArea() instanceof HybridPlotWorld)) {
+        if (!(plot.getArea() instanceof HybridPlotWorld)) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
        }
        this.hybridUtils.setupRoadSchematic(plot);
--- a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
+++ b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
@@ -22,7 +22,6 @@ import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.generator.HybridPlotManager;
 import com.plotsquared.core.generator.HybridUtils;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
@@ -57,8 +56,7 @@ public class DebugRoadRegen extends SubCommand {

    @Override
    public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        if (args.length < 1) {
            player.sendMessage(
                    TranslatableCaption.of("commandconfig.command_syntax"),
@@ -92,8 +90,7 @@ public class DebugRoadRegen extends SubCommand {
    }

    public boolean regenPlot(PlotPlayer<?> player) {
-        Location location = player.getLocation();
-        PlotArea area = location.getPlotArea();
+        PlotArea area = player.getCurrentPlot().getArea();
        if (area == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
            return false;
@@ -148,8 +145,7 @@ public class DebugRoadRegen extends SubCommand {
            return false;
        }

-        Location location = player.getLocation();
-        PlotArea area = location.getPlotArea();
+        PlotArea area = player.getCurrentPlot().getArea();
        if (area == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
        }
--- a/Core/src/main/java/com/plotsquared/core/command/Delete.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Delete.java
@@ -23,7 +23,6 @@ import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.events.TeleportCause;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -61,8 +60,7 @@ public class Delete extends SubCommand {

    @Override
    public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        final Plot plot = location.getPlotAbs();
+        final Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
@@ -92,7 +90,7 @@ public class Delete extends SubCommand {
        final java.util.Set<Plot> plots = plot.getConnectedPlots();
        final int currentPlots = Settings.Limit.GLOBAL ?
                player.getPlotCount() :
-                player.getPlotCount(location.getWorldName());
+                player.getPlotCount(plot.getWorldName());
        Runnable run = () -> {
            if (plot.getRunning() > 0) {
                player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
--- a/Core/src/main/java/com/plotsquared/core/command/Deny.java
+++ b/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;
@@ -72,8 +70,7 @@ public class Deny extends SubCommand {
    @Override
    public boolean onCommand(PlotPlayer<?> player, String[] args) {

-        Location location = player.getLocation();
-        final Plot plot = location.getPlotAbs();
+        final Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
@@ -127,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())) {
-                                    handleKick(plotPlayer, plot);
+                                // Ignore plot-owners
+                                if (plot.isAdded(plotPlayer.getUUID())) {
+                                    continue;
                                }
+                                handleKick(plotPlayer, plot);
                            }
                        }
                    }
--- a/Core/src/main/java/com/plotsquared/core/command/Done.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Done.java
@@ -26,7 +26,6 @@ import com.plotsquared.core.events.PlotDoneEvent;
 import com.plotsquared.core.events.PlotFlagAddEvent;
 import com.plotsquared.core.events.Result;
 import com.plotsquared.core.generator.HybridUtils;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -61,8 +60,7 @@ public class Done extends SubCommand {

    @Override
    public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        final Plot plot = location.getPlotAbs();
+        final Plot plot = player.getCurrentPlot();
        if ((plot == null) || !plot.hasOwner()) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
--- a/Core/src/main/java/com/plotsquared/core/command/Download.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Download.java
@@ -73,7 +73,7 @@ public class Download extends SubCommand {

    @Override
    public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        String world = player.getLocation().getWorldName();
+        String world = player.getCurrentPlot().getWorldName();
        if (!this.plotAreaManager.hasPlotArea(world)) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
            return false;
--- a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
@@ -27,7 +27,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlotFlagAddEvent;
 import com.plotsquared.core.events.PlotFlagRemoveEvent;
 import com.plotsquared.core.events.Result;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -179,8 +178,7 @@ public final class FlagCommand extends Command {
     * @return {@code true} if the player is allowed to modify the flags at their current location
     */
    private static boolean checkRequirements(final @NonNull PlotPlayer<?> player) {
-        final Location location = player.getLocation();
-        final Plot plot = location.getPlotAbs();
+        final Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
@@ -344,7 +342,7 @@ public final class FlagCommand extends Command {
        if (plotFlag == null) {
            return;
        }
-        Plot plot = player.getLocation().getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
        if (event.getEventResult() == Result.DENY) {
            player.sendMessage(
@@ -409,7 +407,7 @@ public final class FlagCommand extends Command {
        if (plotFlag == null) {
            return;
        }
-        Plot plot = player.getLocation().getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
        if (event.getEventResult() == Result.DENY) {
            player.sendMessage(
@@ -419,7 +417,7 @@ public final class FlagCommand extends Command {
            return;
        }
        boolean force = event.getEventResult() == Result.FORCE;
-        final PlotFlag localFlag = player.getLocation().getPlotAbs().getFlagContainer()
+        final PlotFlag localFlag = player.getCurrentPlot().getFlagContainer()
                .getFlag(event.getFlag().getClass());
        if (!force) {
            for (String entry : args[1].split(",")) {
@@ -444,7 +442,7 @@ public final class FlagCommand extends Command {
            return;
        }
        boolean result =
-                player.getLocation().getPlotAbs().setFlag(localFlag.merge(parsed.getValue()));
+                player.getCurrentPlot().setFlag(localFlag.merge(parsed.getValue()));
        if (!result) {
            player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
            return;
@@ -484,7 +482,7 @@ public final class FlagCommand extends Command {
        if (flag == null) {
            return;
        }
-        final Plot plot = player.getLocation().getPlotAbs();
+        final Plot plot = player.getCurrentPlot();
        final PlotFlag<?, ?> flagWithOldValue = plot.getFlagContainer().getFlag(flag.getClass());
        PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
        if (event.getEventResult() == Result.DENY) {
@@ -687,7 +685,7 @@ public final class FlagCommand extends Command {
                            .build()
            );
            // Default value
-            final String defaultValue = player.getLocation().getPlotArea().getFlagContainer()
+            final String defaultValue = player.getCurrentPlot().getArea().getFlagContainer()
                    .getFlagErased(plotFlag.getClass()).toString();
            player.sendMessage(
                    TranslatableCaption.of("flag.flag_info_default_value"),
--- a/Core/src/main/java/com/plotsquared/core/command/Kick.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Kick.java
@@ -65,8 +65,7 @@ public class Kick extends SubCommand {

    @Override
    public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlot();
+        Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
@@ -124,7 +123,7 @@ public class Kick extends SubCommand {
                        );
                        return;
                    }
-                    Location spawn = this.worldUtil.getSpawn(location.getWorldName());
+                    Location spawn = this.worldUtil.getSpawn(plot.getWorldName());
                    player2.sendMessage(TranslatableCaption.of("kick.you_got_kicked"));
                    if (plot.equals(spawn.getPlot())) {
                        Location newSpawn = this.worldUtil.getSpawn(this.plotAreaManager.getAllWorlds()[0]);
@@ -148,8 +147,7 @@ public class Kick extends SubCommand {

    @Override
    public Collection<Command> tab(final PlotPlayer<?> player, final String[] args, final boolean space) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        if (plot == null) {
            return Collections.emptyList();
        }
--- a/Core/src/main/java/com/plotsquared/core/command/Leave.java
+++ b/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"),
--- a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
@@ -150,8 +150,8 @@ public class ListCmd extends SubCommand {
            page = 0;
        }

-        String world = player.getLocation().getWorldName();
-        PlotArea area = player.getApplicablePlotArea();
+        String world = player.getCurrentPlot().getWorldName();
+        PlotArea area = player.getCurrentPlot().getArea();
        String arg = args[0].toLowerCase();
        final boolean[] sort = new boolean[]{true};

--- a/Core/src/main/java/com/plotsquared/core/command/Load.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Load.java
@@ -68,7 +68,7 @@ public class Load extends SubCommand {

    @Override
    public boolean onCommand(final PlotPlayer<?> player, final String[] args) {
-        final String world = player.getLocation().getWorldName();
+        final String world = player.getCurrentPlot().getWorldName();
        if (!this.plotAreaManager.hasPlotArea(world)) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
            return false;
--- a/Core/src/main/java/com/plotsquared/core/command/Middle.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Middle.java
@@ -20,7 +20,6 @@ package com.plotsquared.core.command;

 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.TeleportCause;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;

@@ -36,8 +35,7 @@ public class Middle extends SubCommand {

    @Override
    public boolean onCommand(PlotPlayer<?> player, String[] arguments) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlot();
+        Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
--- a/Core/src/main/java/com/plotsquared/core/command/Move.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Move.java
@@ -20,7 +20,6 @@ package com.plotsquared.core.command;

 import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -55,8 +54,7 @@ public class Move extends SubCommand {
            RunnableVal3<Command, Runnable, Runnable> confirm,
            RunnableVal2<Command, CommandResult> whenDone
    ) {
-        Location location = player.getLocation();
-        Plot plot1 = location.getPlotAbs();
+        Plot plot1 = player.getCurrentPlot();
        if (plot1 == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return CompletableFuture.completedFuture(false);
--- a/Core/src/main/java/com/plotsquared/core/command/Music.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Music.java
@@ -23,7 +23,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlotFlagAddEvent;
 import com.plotsquared.core.events.PlotFlagRemoveEvent;
 import com.plotsquared.core.events.Result;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -74,8 +73,7 @@ public class Music extends SubCommand {

    @Override
    public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        final Plot plot = location.getPlotAbs();
+        final Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
--- a/Core/src/main/java/com/plotsquared/core/command/Remove.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Remove.java
@@ -21,9 +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.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -58,8 +55,7 @@ public class Remove extends SubCommand {

    @Override
    public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
@@ -86,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);
                        }
                    }
                }
@@ -149,8 +130,7 @@ public class Remove extends SubCommand {

    @Override
    public Collection<Command> tab(final PlotPlayer<?> player, final String[] args, final boolean space) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        if (plot == null) {
            return Collections.emptyList();
        }
--- a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
@@ -22,7 +22,6 @@ import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
@@ -102,8 +101,7 @@ public class SchematicCmd extends SubCommand {
                    );
                    break;
                }
-                Location loc = player.getLocation();
-                final Plot plot = loc.getPlotAbs();
+                final Plot plot = player.getCurrentPlot();
                if (plot == null) {
                    player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
                    return false;
@@ -247,8 +245,7 @@ public class SchematicCmd extends SubCommand {
                    player.sendMessage(TranslatableCaption.of("error.task_in_process"));
                    return false;
                }
-                Location location = player.getLocation();
-                Plot plot = location.getPlotAbs();
+                Plot plot = player.getCurrentPlot();
                if (plot == null) {
                    player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
                    return false;
--- a/Core/src/main/java/com/plotsquared/core/command/Set.java
+++ b/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.getLocation().getPlotArea();
+                final PlotArea plotArea = player.getCurrentPlot().getArea();
                if (plotArea == null) {
                    return false;
                }
--- a/Core/src/main/java/com/plotsquared/core/command/SetCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/SetCommand.java
@@ -19,7 +19,6 @@
 package com.plotsquared.core.command;

 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -32,8 +31,7 @@ public abstract class SetCommand extends SubCommand {

    @Override
    public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
+        Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
--- a/Core/src/main/java/com/plotsquared/core/command/Swap.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Swap.java
@@ -19,7 +19,6 @@
 package com.plotsquared.core.command;

 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -44,8 +43,7 @@ public class Swap extends SubCommand {
            RunnableVal3<Command, Runnable, Runnable> confirm,
            RunnableVal2<Command, CommandResult> whenDone
    ) {
-        Location location = player.getLocation();
-        Plot plot1 = location.getPlotAbs();
+        Plot plot1 = player.getCurrentPlot();
        if (plot1 == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return CompletableFuture.completedFuture(false);
@@ -79,8 +77,10 @@ public class Swap extends SubCommand {
        String p1 = plot1.toString();
        String p2 = plot2.toString();

-        return plot1.getPlotModificationManager().move(plot2, player, () -> {
-        }, true).thenApply(result -> {
+        return plot1.getPlotModificationManager().move(
+                plot2, player, () -> {
+                }, true
+        ).thenApply(result -> {
            if (result) {
                player.sendMessage(
                        TranslatableCaption.of("swap.swap_success"),
--- a/Core/src/main/java/com/plotsquared/core/command/Trust.java
+++ b/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,43 +150,23 @@ public class Trust extends Command {
                    return;
                }
                // Success
-                confirm.run(
-                        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;
+                confirm.run(this, () -> {
+                    for (UUID uuid : uuids) {
+                        if (uuid != DBFunc.EVERYONE) {
+                            if (!currentPlot.removeMember(uuid)) {
+                                if (currentPlot.getDenied().contains(uuid)) {
+                                    currentPlot.removeDenied(uuid);
                                }
-
-                                if (uuid != DBFunc.EVERYONE) {
-                                    if (!currentPlot.removeMember(uuid)) {
-                                        if (currentPlot.getDenied().contains(uuid)) {
-                                            currentPlot.removeDenied(uuid);
-                                        }
-                                    }
-                                }
-                                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
-                );
+                        }
+                        currentPlot.addTrusted(uuid);
+                        this.eventDispatcher.callTrusted(player, currentPlot, uuid, true);
+                        player.sendMessage(TranslatableCaption.of("trusted.trusted_added"));
+                    }
+                }, null);
            }
-                    future.complete(true);
-                }
-        );
+            future.complete(true);
+        });
        return CompletableFuture.completedFuture(true);
    }

--- a/Core/src/main/java/com/plotsquared/core/command/Unlink.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Unlink.java
@@ -22,7 +22,6 @@ import com.google.inject.Inject;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlotUnlinkEvent;
 import com.plotsquared.core.events.Result;
-import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -51,8 +50,7 @@ public class Unlink extends SubCommand {

    @Override
    public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Location location = player.getLocation();
-        final Plot plot = location.getPlotAbs();
+        final Plot plot = player.getCurrentPlot();
        if (plot == null) {
            player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
            return false;
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotAddEvent.java
+++ b/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);
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotAddRemoveCancellableEvent.java
+++ b/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;
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotAddRemoveEvent.java
+++ b/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
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java
+++ b/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;
    }
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDenyEvent.java
+++ b/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);
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java
+++ b/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;
    }
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotRemoveEvent.java
+++ b/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);
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustEvent.java
+++ b/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);
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java
+++ b/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;
    }
--- a/Core/src/main/java/com/plotsquared/core/events/post/PostPlayerPlotAddRemoveEvent.java
+++ b/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;
-    }
-
-
-}
--- a/Core/src/main/java/com/plotsquared/core/events/post/PostPlayerPlotAddedEvent.java
+++ b/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);
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/events/post/PostPlayerPlotDeniedEvent.java
+++ b/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);
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/events/post/PostPlayerPlotTrustedEvent.java
+++ b/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);
-    }
-
-}
--- a/Core/src/main/java/com/plotsquared/core/exception/PlotSquaredException.java
+++ b/Core/src/main/java/com/plotsquared/core/exception/PlotSquaredException.java
@@ -0,0 +1,62 @@
+/*
+ * 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.exception;
+
+import com.plotsquared.core.configuration.caption.Caption;
+import com.plotsquared.core.configuration.caption.LocaleHolder;
+
+/**
+ * Internal use only. Used to allow adventure captions to be used in an exception
+ *
+ * @since 7.5.7
+ */
+public final class PlotSquaredException extends RuntimeException {
+
+    private final Caption caption;
+
+    /**
+     * Create a new instance with the given caption
+     *
+     * @param caption caption
+     */
+    public PlotSquaredException(Caption caption) {
+        this.caption = caption;
+    }
+
+    /**
+     * Create a new instance with the given caption and cause
+     *
+     * @param caption caption
+     * @param cause   cause
+     */
+    public PlotSquaredException(Caption caption, Exception cause) {
+        super(cause);
+        this.caption = caption;
+    }
+
+    @Override
+    public String getMessage() {
+        return caption.getComponent(LocaleHolder.console());
+    }
+
+    public Caption getCaption() {
+        return caption;
+    }
+
+}
--- a/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
+++ b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
@@ -290,6 +290,7 @@ 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}
     */
+    @Nullable
    public Plot getCurrentPlot() {
        try (final MetaDataAccess<Plot> lastPlotAccess =
                     this.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
@@ -319,7 +320,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     */
    public int getPlotCount() {
        if (!Settings.Limit.GLOBAL) {
-            return getPlotCount(getLocation().getWorldName());
+            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(getLocation().getWorldName());
+            return getClusterCount(getCurrentPlot().getWorldName());
        }
        final AtomicInteger count = new AtomicInteger(0);
        this.plotAreaManager.forEachPlotArea(value -> {
@@ -408,7 +409,11 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
    }

    public PlotArea getApplicablePlotArea() {
-        return this.plotAreaManager.getApplicablePlotArea(getLocation());
+        Plot plot = getCurrentPlot();
+        if (plot == null) {
+            return this.plotAreaManager.getApplicablePlotArea(getLocation());
+        }
+        return plot.getArea();
    }

    @Override
@@ -614,16 +619,16 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
            PlotId id = plot.getId();
            int x = id.getX();
            int z = id.getY();
-            ByteBuffer buffer = ByteBuffer.allocate(13);
+            ByteBuffer buffer = ByteBuffer.allocate(14);
            buffer.putShort((short) x);
            buffer.putShort((short) z);
            Location location = getLocation();
            buffer.putInt(location.getX());
-            buffer.put((byte) location.getY());
+            buffer.putShort((short) location.getY());
            buffer.putInt(location.getZ());
-            setPersistentMeta("quitLoc", buffer.array());
-        } else if (hasPersistentMeta("quitLoc")) {
-            removePersistentMeta("quitLoc");
+            setPersistentMeta("quitLocV2", buffer.array());
+        } else if (hasPersistentMeta("quitLocV2")) {
+            removePersistentMeta("quitLocV2");
        }
        if (plot != null) {
            this.eventDispatcher.callLeave(this, plot);
@@ -700,11 +705,18 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
                            return;
                        }
                        PlotArea area = ((SinglePlotAreaManager) manager).getArea();
+                        boolean V2 = false;
                        byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
                        if (arr == null) {
-                            return;
+                            arr = PlotPlayer.this.getPersistentMeta("quitLocV2");
+                            if (arr == null) {
+                                return;
+                            }
+                            V2 = true;
+                            removePersistentMeta("quitLocV2");
+                        } else {
+                            removePersistentMeta("quitLoc");
                        }
-                        removePersistentMeta("quitLoc");

                        if (!getMeta("teleportOnLogin", true)) {
                            return;
@@ -714,7 +726,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
                        final int plotZ = quitWorld.getShort();
                        PlotId id = PlotId.of(plotX, plotZ);
                        int x = quitWorld.getInt();
-                        int y = quitWorld.get() & 0xFF;
+                        int y = V2 ? quitWorld.getShort() : (quitWorld.get() & 0xFF);
                        int z = quitWorld.getInt();
                        Plot plot = area.getOwnedPlot(id);

@@ -748,10 +760,11 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
                            }
                        }
                    } catch (Throwable e) {
-                        e.printStackTrace();
+                        LOGGER.error("Error populating persistent meta for player {}", PlotPlayer.this.getName(), e);
                    }
                }
-            });
+                    }
+            );
        }
    }

--- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java
+++ b/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;
@@ -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);
@@ -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);
-            }
+            plot.addTrusted(uuid);
        }
        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);
-            }
+            this.addTrusted(uuid);
        }
        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);
-            }
+            plot.addMember(uuid);
        }
        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);
-            }
+            this.addMember(uuid);
        }

        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);
-            }
+            plot.addDenied(uuid);
        }
        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);
-            }
+            this.addDenied(uuid);
        }
    }

--- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
+++ b/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();
-                trusted.forEach(uuid -> {
-                    if (!currentlyTrusted.contains(uuid) && eventDispatcher.callPlayerTrust(
-                            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.setTrusted(trusted);
+                plot.setMembers(members);
+                plot.setDenied(denied);

                Plot plot2;
                if (lx) {
--- a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java
+++ b/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
--- a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
+++ b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
@@ -135,6 +135,7 @@ public abstract class SchematicHandler {
        }
        final String filename;
        final String website;
+        final @Nullable UUID finalUuid = uuid;
        if (uuid == null) {
            uuid = UUID.randomUUID();
            website = Settings.Web.URL + "upload.php?" + uuid;
@@ -144,10 +145,11 @@ public abstract class SchematicHandler {
            filename = file + '.' + extension;
        }
        final URL url;
+        String uri = Settings.Web.URL + "?key=" + uuid + "&type=" + extension;
        try {
-            url = URI.create(Settings.Web.URL + "?key=" + uuid + "&type=" + extension).toURL();
+            url = URI.create(uri).toURL();
        } catch (MalformedURLException e) {
-            e.printStackTrace();
+            LOGGER.error("Malformed URI `{}`", uri, e);
            whenDone.run();
            return;
        }
@@ -193,7 +195,7 @@ public abstract class SchematicHandler {
                }
                TaskManager.runTask(whenDone);
            } catch (IOException e) {
-                e.printStackTrace();
+                LOGGER.error("Error while uploading schematic for UUID {}", finalUuid, e);
                TaskManager.runTask(whenDone);
            }
        });
@@ -388,8 +390,14 @@ public abstract class SchematicHandler {
            }
            queue.enqueue();
        } catch (Exception e) {
-            e.printStackTrace();
            TaskManager.runTask(whenDone);
+            LOGGER.error(
+                    "Error pasting schematic to plot {};{} for player {}",
+                    plot.getArea(),
+                    plot.getId(),
+                    actor == null ? "null" : actor.getName(),
+                    e
+            );
        }
    }

@@ -456,7 +464,7 @@ public abstract class SchematicHandler {
                Clipboard clip = reader.read();
                return new Schematic(clip);
            } catch (IOException e) {
-                e.printStackTrace();
+                LOGGER.error("Error reading schematic from file {}", file.getAbsolutePath(), e);
            }
        } else {
            throw new UnsupportedFormatException("This schematic format is not recognised or supported.");
@@ -470,7 +478,7 @@ public abstract class SchematicHandler {
            InputStream inputStream = Channels.newInputStream(readableByteChannel);
            return getSchematic(inputStream);
        } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.error("Error reading schematic from {}", url, e);
        }
        return null;
    }
@@ -486,7 +494,7 @@ public abstract class SchematicHandler {
                Clipboard clip = schematicReader.read();
                return new Schematic(clip);
            } catch (IOException e) {
-                e.printStackTrace();
+                LOGGER.error("Error reading schematic", e);
            }
        }
        return null;
@@ -515,7 +523,7 @@ public abstract class SchematicHandler {
            }
            return schematics;
        } catch (JsonParseException | IOException e) {
-            e.printStackTrace();
+            LOGGER.error("Error retrieving saves for UUID {}", uuid, e);
        }
        return null;
    }
@@ -532,7 +540,7 @@ public abstract class SchematicHandler {
                try (NBTOutputStream nos = new NBTOutputStream(new GZIPOutputStream(output, true))) {
                    nos.writeNamedTag("Schematic", tag);
                } catch (IOException e1) {
-                    e1.printStackTrace();
+                    LOGGER.error("Error uploading schematic for UUID {}", uuid, e1);
                }
            }
        }, whenDone);
@@ -556,9 +564,9 @@ public abstract class SchematicHandler {
                nbtStream.writeNamedTag("Schematic", tag);
            }
        } catch (FileNotFoundException e) {
-            e.printStackTrace();
+            LOGGER.error("Error saving schematic at {}", path, e);
        } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.error("Error saving schematic at {}", path, e);
            return false;
        }
        return true;
@@ -581,7 +589,7 @@ public abstract class SchematicHandler {
        schematic.put("BlockData", new ByteArrayTag(buffer.toByteArray()));
        schematic.put("BlockEntities", new ListTag(CompoundTag.class, tileEntities));

-        if (biomeBuffer.size() == 0 || biomePalette.size() == 0) {
+        if (biomeBuffer.size() == 0 || biomePalette.isEmpty()) {
            return;
        }

@@ -733,10 +741,7 @@ public abstract class SchematicHandler {
                                    }
                                    BaseBlock block = aabb.getWorld().getFullBlock(point);
                                    if (block.getNbtData() != null) {
-                                        Map<String, Tag> values = new HashMap<>();
-                                        for (Map.Entry<String, Tag> entry : block.getNbtData().getValue().entrySet()) {
-                                            values.put(entry.getKey(), entry.getValue());
-                                        }
+                                        Map<String, Tag> values = new HashMap<>(block.getNbtData().getValue());

                                        // Positions are kept in NBT, we don't want that.
                                        values.remove("x");
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
 }

 group = "com.intellectualsites.plotsquared"
-version = "7.5.7-SNAPSHOT"
+version = "7.5.7"

 if (!File("$rootDir/.git").exists()) {
    logger.lifecycle("""
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.9.4"
-checkerqual = "3.49.5"
+checkerqual = "3.50.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
Author	SHA1	Message	Date
Alexander Brandes	f01c287f89	Release 7.5.7 Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-09-09 21:55:30 +02:00
renovate[bot]	fd8cf3c475	Update dependency org.checkerframework:checker-qual to v3.50.0 (#4749 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-09-08 01:36:33 +00:00
renovate[bot]	8c9957edeb	Update actions/setup-java action to v5 (#4750 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-09-08 01:36:15 +00:00
Jordan	aaba2b5b1a	fix: improve error handling in backups (#4740 ) * fix: improve error handling in backups - fixes #4460 * cleanup * Update Core/src/main/java/com/plotsquared/core/backup/Backup.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Alexander Brandes <mc.cache@web.de> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-09-01 20:29:52 +02:00
Jordan	02a65c8855	fix: use PlotPlayer#getCurrentPlot across commands to allow /<command> <id> usage (#4738 ) * fix: use PlotPlayer#getCurrentPlot across commands to allow /<command> <id> usage - fixes #4526 - supersedes #4675 * cleanup	2025-08-30 20:33:13 +02:00
Jordan	8a5fa26796	fix: allow extended world height when teleporting player on join (#4739 )	2025-08-30 20:32:40 +02:00
renovate[bot]	13cbb7e083	Update actions/checkout action to v5 (#4746 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-08-25 01:08:14 +00:00