chore/feat: migrate to LocationTransformer to resolve unnecessary chunk loads

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

@@ -21,10 +21,7 @@ package com.plotsquared.core.events;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
-import org.jetbrains.annotations.NotNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.Objects;
-import java.util.function.Consumer;
 
 /**
  * Called when a player teleports to a plot
@@ -34,23 +31,21 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
     private final TeleportCause cause;
     private Result eventResult;
     private final Location from;
-    private Location location;
+    private LocationTransformer locationTransformer;
 
 
     /**
      * PlayerTeleportToPlotEvent: Called when a player teleports to a plot
      *
-     * @param player   That was teleported
+     * @param player That was teleported
-     * @param from     The origin location, from where the teleport was triggered (players location most likely)
+     * @param from   The origin location, from where the teleport was triggered (players location most likely)
-     * @param location The initial location where the player will be teleported to
+     * @param plot   Plot to which the player was teleported
-     * @param plot     Plot to which the player was teleported
+     * @param cause  Why the teleport is being completed
-     * @param cause    Why the teleport is being completed
      * @since 6.1.0
      */
-    public PlayerTeleportToPlotEvent(PlotPlayer<?> player, Location from, Location location, Plot plot, TeleportCause cause) {
+    public PlayerTeleportToPlotEvent(PlotPlayer<?> player, Location from, Plot plot, TeleportCause cause) {
         super(player, plot);
         this.from = from;
-        this.location = location;
         this.cause = cause;
     }
 
@@ -75,26 +70,24 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
     }
 
     /**
-     * Get the current location where the player will be teleported to.
+     * Gets the currently applied {@link LocationTransformer} or null, if none was set
-     * Defaults to {@link Plot#getHome(Consumer)} or {@link Plot#getDefaultHome(boolean, Consumer)}
      *
-     * @return Location
+     * @return LocationTransformer
      * @since TODO
      */
-    public Location getLocation() {
+    public @Nullable LocationTransformer getLocationTransformer() {
-        return this.location;
+        return this.locationTransformer;
     }
 
     /**
-     * Set the new location where the player should be teleported to.
+     * Sets the {@link LocationTransformer} to mutate the location where the player will be teleported to.
-     * <b>Must</b> be not-null. If your intention is to cancel this teleport, see {@link #setEventResult(Result)}
+     * May be {@code null}, if any previous set transformations should be discarded.
-     * @param location The new location
+     *
+     * @param locationTransformer The new transformer
      * @since TODO
      */
-    public void setLocation(@NotNull Location location) {
+    public void setLocationTransformer(@Nullable LocationTransformer locationTransformer) {
-        Objects.requireNonNull(location, "PlayerTeleportToPlotEvent#location may never be null. " +
+        this.locationTransformer = locationTransformer;
-                "If you intend to cancel the teleport, use PlayerTeleportToPlotEvent#setEventResult");
-        this.location = location;
     }
 
     @Override
@@ -107,4 +100,17 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
         this.eventResult = e;
     }
 
+    public interface LocationTransformer {
+
+        /**
+         * Transforms an input location {@code origin} to a new location
+         *
+         * @param origin The origin location which should be transformed
+         * @return The transformed location
+         * @since TODO
+         */
+        Location transform(Location origin);
+
+    }
+
 }

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

@@ -2615,17 +2615,20 @@ public class Plot {
      */
     public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) {
         Plot plot = this.getBasePlot(false);
+
+        PlayerTeleportToPlotEvent event = this.eventDispatcher.callTeleport(player, player.getLocation(), plot, cause);
+        if (event.getEventResult() == Result.DENY) {
+            player.sendMessage(
+                    TranslatableCaption.of("events.event_denied"),
+                    TagResolver.resolver("value", Tag.inserting(Component.text("Teleport")))
+            );
+            resultConsumer.accept(false);
+            return;
+        }
+
         final Consumer<Location> locationConsumer = calculatedLocation -> {
-            PlayerTeleportToPlotEvent event = this.eventDispatcher.callTeleport(player, player.getLocation(), calculatedLocation, plot, cause);
+            Location location = event.getLocationTransformer() == null ?
-            if (event.getEventResult() == Result.DENY) {
+                    calculatedLocation : event.getLocationTransformer().transform(calculatedLocation);
-                player.sendMessage(
-                        TranslatableCaption.of("events.event_denied"),
-                        TagResolver.resolver("value", Tag.inserting(Component.text("Teleport")))
-                );
-                resultConsumer.accept(false);
-                return;
-            }
-            Location location = event.getLocation();
             if (Settings.Teleport.DELAY == 0 || player.hasPermission("plots.teleport.delay.bypass")) {
                 player.sendMessage(TranslatableCaption.of("teleport.teleported_to_plot"));
                 player.teleport(location, cause);

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

@@ -158,9 +158,8 @@ public class EventDispatcher {
         return event;
     }
 
-    public PlayerTeleportToPlotEvent callTeleport(PlotPlayer<?> player, Location from, Location location, Plot plot,
+    public PlayerTeleportToPlotEvent callTeleport(PlotPlayer<?> player, Location from, Plot plot, TeleportCause cause) {
-                                                  TeleportCause cause) {
+        PlayerTeleportToPlotEvent event = new PlayerTeleportToPlotEvent(player, from, plot, cause);
-        PlayerTeleportToPlotEvent event = new PlayerTeleportToPlotEvent(player, from, location, plot, cause);
         callEvent(event);
         return event;
     }