fix: block nbt population

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java

@@ -90,12 +90,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         this.plotGenerator = generator;
         this.platformGenerator = this;
         this.populators = new ArrayList<>();
-        int minecraftMinorVersion = PlotSquared.platform().serverVersion()[1];
-        if (minecraftMinorVersion >= 17) {
         this.populators.add(new BlockStatePopulator(this.plotGenerator));
-        } else {
-            this.populators.add(new LegacyBlockStatePopulator(this.plotGenerator));
-        }
         this.full = true;
         this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
         this.biomeProvider = new BukkitPlotBiomeProvider();

Bukkit/src/main/java/com/plotsquared/bukkit/generator/LegacyBlockStatePopulator.java

@@ -36,6 +36,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Random;
 
+@Deprecated(since = "TODO")
 final class LegacyBlockStatePopulator extends BlockPopulator {
 
     private final IndependentPlotGenerator plotGenerator;

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

@@ -47,7 +47,6 @@ import org.bukkit.event.entity.LingeringPotionSplashEvent;
 import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
-import org.bukkit.event.player.PlayerEggThrowEvent;
 import org.bukkit.projectiles.BlockProjectileSource;
 import org.bukkit.projectiles.ProjectileSource;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -158,26 +157,14 @@ public class ProjectileEventListener implements Listener {
 
     @EventHandler
     public void onProjectileHit(ProjectileHitEvent event) {
-        if (cancelProjectileHit(event.getEntity())) {
+        Projectile entity = event.getEntity();
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler
-    public void onPlayerEggThrow(PlayerEggThrowEvent event) {
-        if (cancelProjectileHit(event.getEgg())) {
-            event.setHatching(false);
-        }
-    }
-
-    private boolean cancelProjectileHit(Projectile entity) {
         Location location = BukkitUtil.adapt(entity.getLocation());
         if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
-            return false;
+            return;
         }
         PlotArea area = location.getPlotArea();
         if (area == null) {
-            return false;
+            return;
         }
         Plot plot = area.getPlot(location);
         ProjectileSource shooter = entity.getShooter();
@@ -185,14 +172,15 @@ public class ProjectileEventListener implements Listener {
             if (!((Player) shooter).isOnline()) {
                 if (plot != null) {
                     if (plot.isAdded(((Player) shooter).getUniqueId()) || plot.getFlag(ProjectilesFlag.class)) {
-                        return false;
+                        return;
                     }
                 } else if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true)) {
-                    return false;
+                    return;
                 }
 
                 entity.remove();
-                return true;
+                event.setCancelled(true);
+                return;
             }
 
             PlotPlayer<?> pp = BukkitUtil.adapt((Player) shooter);
@@ -201,36 +189,38 @@ public class ProjectileEventListener implements Listener {
                         Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED
                 )) {
                     entity.remove();
-                    return true;
+                    event.setCancelled(true);
                 }
-                return false;
+                return;
             }
             if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(
                     ProjectilesFlag.class) || (entity instanceof FishHook && plot.getFlag(
                     FishingFlag.class))) {
-                return false;
+                return;
             }
             entity.remove();
-            return true;
+            event.setCancelled(true);
+            return;
         }
         if (!(shooter instanceof Entity) && shooter != null) {
             if (plot == null) {
                 entity.remove();
-                return true;
+                event.setCancelled(true);
+                return;
             }
             Location sLoc =
                     BukkitUtil.adapt(((BlockProjectileSource) shooter).getBlock().getLocation());
             if (!area.contains(sLoc.getX(), sLoc.getZ())) {
                 entity.remove();
-                return true;
+                event.setCancelled(true);
+                return;
             }
             Plot sPlot = area.getOwnedPlotAbs(sLoc);
             if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
                 entity.remove();
-                return true;
+                event.setCancelled(true);
             }
         }
-        return false;
     }
 
 }

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java

@@ -21,6 +21,7 @@ package com.plotsquared.bukkit.schematic;
 import com.destroystokyo.paper.profile.PlayerProfile;
 import com.destroystokyo.paper.profile.ProfileProperty;
 import com.plotsquared.bukkit.util.BukkitUtil;
+import com.plotsquared.core.PlotSquared;
 import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.ListTag;
@@ -36,6 +37,8 @@ import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.DyeColor;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.block.Banner;
 import org.bukkit.block.Block;
@@ -44,25 +47,35 @@ import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
 import org.bukkit.block.banner.Pattern;
 import org.bukkit.block.banner.PatternType;
+import org.bukkit.block.sign.Side;
+import org.bukkit.block.sign.SignSide;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.function.BiConsumer;
 
+// TODO: somehow unbreak this class so it doesn't fuck up the whole schematic population system due to MC updates
+@ApiStatus.Internal
 public class StateWrapper {
 
-    public CompoundTag tag;
-
-    private boolean paperErrorTextureSent = false;
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
+    private static final boolean MODERN_SIGNS = PlotSquared.platform().serverVersion()[1] > 19;
+    private final Registry<PatternType> PATTERN_TYPE_REGISTRY = Objects.requireNonNull(Bukkit.getRegistry(PatternType.class));
+
+    private static boolean paperErrorTextureSent = false;
+
+    public CompoundTag tag;
 
     public StateWrapper(CompoundTag tag) {
         this.tag = tag;
@@ -212,9 +225,9 @@ public class StateWrapper {
                     if (type == null) {
                         continue;
                     }
-                    int count = itemComp.getByte("Count");
+                    int count = itemComp.containsKey("count") ? itemComp.getInt("count") : itemComp.getByte("Count");
                     int slot = itemComp.getByte("Slot");
-                    CompoundTag tag = (CompoundTag) itemComp.getValue().get("tag");
+                    CompoundTag tag = (CompoundTag) itemComp.getValue().get(itemComp.containsKey("tag") ? "tag" : "components");
                     BaseItemStack baseItemStack = new BaseItemStack(type, tag, count);
                     ItemStack itemStack = BukkitAdapter.adapt(baseItemStack);
                     inv.setItem(slot, itemStack);
@@ -223,83 +236,63 @@ public class StateWrapper {
                 return true;
             }
             case "sign" -> {
-                if (state instanceof Sign sign) {
+                if (state instanceof Sign sign && this.restoreSign(sign)) {
-                    sign.setLine(0, jsonToColourCode(tag.getString("Text1")));
+                    state.update(true, false);
-                    sign.setLine(1, jsonToColourCode(tag.getString("Text2")));
-                    sign.setLine(2, jsonToColourCode(tag.getString("Text3")));
-                    sign.setLine(3, jsonToColourCode(tag.getString("Text4")));
-                    state.update(true);
                     return true;
                 }
                 return false;
             }
             case "skull" -> {
-                if (state instanceof Skull skull) {
+                if (state instanceof Skull skull && this.restoreSkull(skull)) {
-                    CompoundTag skullOwner = ((CompoundTag) this.tag.getValue().get("SkullOwner"));
+                    skull.update(true, false);
-                    if (skullOwner == null) {
                     return true;
                 }
-                    String player = skullOwner.getString("Name");
-
-                    if (player != null && !player.isEmpty()) {
-                        try {
-                            skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
-                            skull.update(true);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        return true;
-                    }
-
-                    final CompoundTag properties = (CompoundTag) skullOwner.getValue().get("Properties");
-                    if (properties == null) {
-                        return false;
-                    }
-                    final ListTag textures = properties.getListTag("textures");
-                    if (textures.getValue().isEmpty()) {
-                        return false;
-                    }
-                    final CompoundTag textureCompound = (CompoundTag) textures.getValue().get(0);
-                    if (textureCompound == null) {
-                        return false;
-                    }
-                    String textureValue = textureCompound.getString("Value");
-                    if (textureValue == null) {
-                        return false;
-                    }
-                    if (!PaperLib.isPaper()) {
-                        if (!paperErrorTextureSent) {
-                            paperErrorTextureSent = true;
-                            LOGGER.error("Failed to populate skull data in your road schematic - This is a Spigot limitation.");
-                        }
-                        return false;
-                    }
-                    final PlayerProfile profile = Bukkit.createProfile(UUID.randomUUID());
-                    profile.setProperty(new ProfileProperty("textures", textureValue));
-                    skull.setPlayerProfile(profile);
-                    skull.update(true);
-                    return true;
-
-                }
                 return false;
             }
             case "banner" -> {
                 if (state instanceof Banner banner) {
-                    List<Tag> patterns = this.tag.getListTag("Patterns").getValue();
+                    List<CompoundTag> patterns;
-                    if (patterns == null || patterns.isEmpty()) {
+                    // "old" format
-                        return false;
+                    if ((patterns = this.tag.getList("Patterns", CompoundTag.class)) != null && !patterns.isEmpty()) {
-                    }
+                        banner.setPatterns(patterns.stream().map(compoundTag -> {
-                    banner.setPatterns(patterns.stream().map(t -> (CompoundTag) t).map(compoundTag -> {
                             DyeColor color = DyeColor.getByWoolData((byte) compoundTag.getInt("Color"));
-                        PatternType patternType = PatternType.getByIdentifier(compoundTag.getString("Pattern"));
+                            final PatternType patternType = PATTERN_TYPE_REGISTRY.get(Objects.requireNonNull(
+                                    NamespacedKey.fromString(compoundTag.getString("Pattern"))
+                            ));
                             if (color == null || patternType == null) {
                                 return null;
                             }
                             return new Pattern(color, patternType);
                         }).filter(Objects::nonNull).toList());
-                    banner.update(true);
+                        banner.update(true, false);
                         return true;
                     }
+
+                    // "new" format - since 1.21.3-ish
+                    if ((patterns = this.tag.getList("patterns", CompoundTag.class)) != null && !patterns.isEmpty()) {
+                        for (final CompoundTag patternTag : patterns) {
+                            final String color = patternTag.getString("color");
+                            if (color.isEmpty()) {
+                                continue;
+                            }
+                            final Tag pattern = patternTag.getValue().get("pattern");
+                            if (pattern instanceof StringTag patternString && !patternString.getValue().isEmpty()) {
+                                final PatternType patternType = PATTERN_TYPE_REGISTRY.get(Objects.requireNonNull(
+                                        NamespacedKey.fromString(patternString.getValue())
+                                ));
+                                if (patternType == null) {
+                                    continue;
+                                }
+                                banner.addPattern(new Pattern(
+                                        DyeColor.legacyValueOf(color.toUpperCase(Locale.ROOT)),
+                                        patternType
+                                ));
+                            }
+                            // not supporting banner pattern definitions (no API available)
+                        }
+                        banner.update(true, false);
+                    }
+                }
                 return false;
             }
         }
@@ -346,4 +339,150 @@ public class StateWrapper {
         return data;
     }
 
+    private boolean restoreSkull(Skull skull) {
+        boolean updated = false;
+        // can't support custom_name - Spigot does not provide any API for that
+        if (this.tag.containsKey("note_block_sound")) {
+            skull.setNoteBlockSound(NamespacedKey.fromString(this.tag.getString("note_block_sound")));
+            updated = true;
+        }
+        // modern format - MC 1.21.3-ish
+        if (this.tag.containsKey("profile")) {
+            final Tag profile = this.tag.getValue().get("profile");
+            if (profile instanceof StringTag stringTag) {
+                final String name = stringTag.getValue();
+                if (name != null && !name.isEmpty()) {
+                    skull.setOwningPlayer(Bukkit.getOfflinePlayer(name));
+                    return true;
+                }
+                return updated;
+            }
+            if (profile instanceof CompoundTag compoundTag) {
+                final List<Tag> properties = compoundTag.getList("properties");
+                if (properties != null && !properties.isEmpty()) {
+                    if (!PaperLib.isPaper()) {
+                        if (!paperErrorTextureSent) {
+                            paperErrorTextureSent = true;
+                            LOGGER.error("Failed to populate schematic skull data - this is a Spigot limitation.");
+                        }
+                        return updated;
+                    }
+                    for (final Tag propertyTag : properties) {
+                        if (!(propertyTag instanceof CompoundTag property)) {
+                            continue;
+                        }
+                        if (!property.getString("name").equals("textures")) {
+                            continue;
+                        }
+                        final String value = property.getString("value");
+                        final String signature = property.containsKey("signature") ? property.getString("signature") : null;
+                        final PlayerProfile playerProfile = Bukkit.createProfile(UUID.randomUUID());
+                        playerProfile.setProperty(new ProfileProperty("textures", value, signature));
+                        skull.setPlayerProfile(playerProfile);
+                        return true;
+                    }
+                    return updated;
+                }
+                final int[] id = compoundTag.getIntArray("id");
+                if (id != null && id.length == 4) {
+                    skull.setOwningPlayer(Bukkit.getOfflinePlayer(new UUID(
+                            (long) id[0] << 32 | (id[1] & 0xFFFFFFFFL),
+                            (long) id[2] << 32 | (id[3] & 0xFFFFFFFFL)
+                    )));
+                    return true;
+                }
+                final String name = compoundTag.getString("name");
+                if (name != null && !name.isEmpty()) {
+                    skull.setOwningPlayer(Bukkit.getOfflinePlayer(name));
+                    return true;
+                }
+            }
+        }
+
+        // "Old" MC format (idk when it got updated)
+        if (this.tag.getValue().get("SkullOwner") instanceof CompoundTag skullOwner) {
+            if (skullOwner.getValue().get("Name") instanceof StringTag ownerName && !ownerName.getValue().isEmpty()) {
+                skull.setOwningPlayer(Bukkit.getOfflinePlayer(ownerName.getValue()));
+                skull.update(true);
+                return true;
+            }
+            if (skullOwner.getValue().get("Properties") instanceof CompoundTag properties) {
+                if (!paperErrorTextureSent) {
+                    paperErrorTextureSent = true;
+                    LOGGER.error("Failed to populate schematic skull data - this is a Spigot limitation.");
+                    return updated;
+                }
+                final List<CompoundTag> textures = properties.getList("textures", CompoundTag.class);
+                if (textures.isEmpty()) {
+                    return updated;
+                }
+                final String value = textures.get(0).getString("Value");
+                if (!value.isEmpty()) {
+                    final PlayerProfile profile = Bukkit.createProfile(UUID.randomUUID());
+                    profile.setProperty(new ProfileProperty("textures", value));
+                    skull.setPlayerProfile(profile);
+                    return true;
+                }
+            }
+        }
+        return updated;
+    }
+
+    private boolean restoreSign(Sign sign) {
+        // "old" format (pre 1.20)
+        if (this.tag.containsKey("Text1") || this.tag.containsKey("Text2")
+                || this.tag.containsKey("Text3") || this.tag.containsKey("Text4")) {
+            if (!MODERN_SIGNS) {
+                sign.setLine(0, jsonToColourCode(tag.getString("Text1")));
+                sign.setLine(1, jsonToColourCode(tag.getString("Text2")));
+                sign.setLine(2, jsonToColourCode(tag.getString("Text3")));
+                sign.setLine(3, jsonToColourCode(tag.getString("Text4")));
+                sign.setGlowingText(tag.getByte("GlowingText") == 1);
+                if (tag.getValue().get("Color") instanceof StringTag colorTag && !colorTag.getValue().isEmpty()) {
+                    sign.setColor(DyeColor.legacyValueOf(colorTag.getValue()));
+                }
+                return true;
+            }
+            SignSide front = sign.getSide(Side.FRONT);
+            front.setLine(0, jsonToColourCode(tag.getString("Text1")));
+            front.setLine(1, jsonToColourCode(tag.getString("Text2")));
+            front.setLine(2, jsonToColourCode(tag.getString("Text3")));
+            front.setLine(3, jsonToColourCode(tag.getString("Text4")));
+            front.setGlowingText(tag.getByte("GlowingText") == 1);
+            if (tag.getValue().get("Color") instanceof StringTag colorTag && !colorTag.getValue().isEmpty()) {
+                front.setColor(DyeColor.legacyValueOf(colorTag.getValue()));
+            }
+            return true;
+        }
+
+        // "modern" format
+        if (this.tag.containsKey("front_text") || this.tag.containsKey("back_text") || this.tag.containsKey("is_waxed")) {
+            // the new format on older servers shouldn't be possible, I hope?
+            sign.setWaxed(this.tag.getByte("is_waxed") == 1);
+            BiConsumer<SignSide, CompoundTag> sideSetter = (signSide, compoundTag) -> {
+                signSide.setGlowingText(compoundTag.getByte("has_glowing_text") == 1);
+                if (tag.getValue().get("color") instanceof StringTag colorTag && !colorTag.getValue().isEmpty()) {
+                    signSide.setColor(DyeColor.legacyValueOf(colorTag.getValue()));
+                }
+                final List<Tag> lines = compoundTag.getList("messages");
+                for (int i = 0; i < Math.min(lines.size(), 4); i++) {
+                    final Tag line = lines.get(i);
+                    if (line instanceof StringTag stringLine) {
+                        signSide.setLine(i, jsonToColourCode(stringLine.getValue()));
+                        continue;
+                    }
+                    // TODO: how tf support list of components + components - utilize paper + adventure?
+                }
+            };
+            if (this.tag.getValue().get("front_text") instanceof CompoundTag frontText) {
+                sideSetter.accept(sign.getSide(Side.FRONT), frontText);
+            }
+            if (this.tag.getValue().get("back_text") instanceof CompoundTag backText) {
+                sideSetter.accept(sign.getSide(Side.BACK), backText);
+            }
+            return true;
+        }
+        return false;
+    }
+
 }

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

@@ -21,6 +21,7 @@ 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;
@@ -57,7 +58,8 @@ public class Alias extends SubCommand {
             return false;
         }
 
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -20,7 +20,6 @@ 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;
@@ -85,9 +84,8 @@ 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(
-                plotCount + plots.size() <= player.getAllowedPlots(),
+                player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
                 TranslatableCaption.of("permission.cant_claim_more_plots"),
                 TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
         );

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

@@ -26,6 +26,7 @@ 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;
@@ -71,7 +72,8 @@ public class Claim extends SubCommand {
         if (args.length >= 1) {
             schematic = args[0];
         }
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -88,7 +90,7 @@ public class Claim extends SubCommand {
         boolean force = event.getEventResult() == Result.FORCE;
         int currentPlots = Settings.Limit.GLOBAL ?
                 player.getPlotCount() :
-                player.getPlotCount(plot.getWorldName());
+                player.getPlotCount(location.getWorldName());
 
         final PlotArea area = plot.getArea();
 

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();
-        int plotCount = Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plot.getWorldName());
+        if (!Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots()
-        if (!Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots() < plotCount + size)) {
+                < player.getPlotCount() + size)) {
             player.sendMessage(
                     TranslatableCaption.of("permission.cant_claim_more_plots"),
                     TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))

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

@@ -19,6 +19,7 @@
 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;
@@ -36,7 +37,8 @@ public class Copy extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        Plot plot1 = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot1 = location.getPlotAbs();
         if (plot1 == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -22,6 +22,7 @@ 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;
@@ -46,7 +47,8 @@ public class CreateRoadSchematic extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -55,7 +57,7 @@ public class CreateRoadSchematic extends SubCommand {
             player.sendMessage(TranslatableCaption.of("schematics.schematic_too_large"));
             return false;
         }
-        if (!(plot.getArea() instanceof HybridPlotWorld)) {
+        if (!(location.getPlotArea() instanceof HybridPlotWorld)) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
         }
         this.hybridUtils.setupRoadSchematic(plot);

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

@@ -22,6 +22,7 @@ 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;
@@ -56,7 +57,8 @@ public class DebugRoadRegen extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (args.length < 1) {
             player.sendMessage(
                     TranslatableCaption.of("commandconfig.command_syntax"),
@@ -90,7 +92,8 @@ public class DebugRoadRegen extends SubCommand {
     }
 
     public boolean regenPlot(PlotPlayer<?> player) {
-        PlotArea area = player.getCurrentPlot().getArea();
+        Location location = player.getLocation();
+        PlotArea area = location.getPlotArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
             return false;
@@ -145,7 +148,8 @@ public class DebugRoadRegen extends SubCommand {
             return false;
         }
 
-        PlotArea area = player.getCurrentPlot().getArea();
+        Location location = player.getLocation();
+        PlotArea area = location.getPlotArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
         }

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

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

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

@@ -70,7 +70,8 @@ public class Deny extends SubCommand {
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
 
-        final Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        final Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -26,6 +26,7 @@ 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;
@@ -60,7 +61,8 @@ public class Done extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, String[] args) {
-        final Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        final Plot plot = location.getPlotAbs();
         if ((plot == null) || !plot.hasOwner()) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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.getCurrentPlot().getWorldName();
+        String world = player.getLocation().getWorldName();
         if (!this.plotAreaManager.hasPlotArea(world)) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
             return false;

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

@@ -27,6 +27,7 @@ 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;
@@ -178,7 +179,8 @@ 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 Plot plot = player.getCurrentPlot();
+        final Location location = player.getLocation();
+        final Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -342,7 +344,7 @@ public final class FlagCommand extends Command {
         if (plotFlag == null) {
             return;
         }
-        Plot plot = player.getCurrentPlot();
+        Plot plot = player.getLocation().getPlotAbs();
         PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
@@ -407,7 +409,7 @@ public final class FlagCommand extends Command {
         if (plotFlag == null) {
             return;
         }
-        Plot plot = player.getCurrentPlot();
+        Plot plot = player.getLocation().getPlotAbs();
         PlotFlagAddEvent event = eventDispatcher.callFlagAdd(plotFlag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
@@ -417,7 +419,7 @@ public final class FlagCommand extends Command {
             return;
         }
         boolean force = event.getEventResult() == Result.FORCE;
-        final PlotFlag localFlag = player.getCurrentPlot().getFlagContainer()
+        final PlotFlag localFlag = player.getLocation().getPlotAbs().getFlagContainer()
                 .getFlag(event.getFlag().getClass());
         if (!force) {
             for (String entry : args[1].split(",")) {
@@ -442,7 +444,7 @@ public final class FlagCommand extends Command {
             return;
         }
         boolean result =
-                player.getCurrentPlot().setFlag(localFlag.merge(parsed.getValue()));
+                player.getLocation().getPlotAbs().setFlag(localFlag.merge(parsed.getValue()));
         if (!result) {
             player.sendMessage(TranslatableCaption.of("flag.flag_not_added"));
             return;
@@ -482,7 +484,7 @@ public final class FlagCommand extends Command {
         if (flag == null) {
             return;
         }
-        final Plot plot = player.getCurrentPlot();
+        final Plot plot = player.getLocation().getPlotAbs();
         final PlotFlag<?, ?> flagWithOldValue = plot.getFlagContainer().getFlag(flag.getClass());
         PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
         if (event.getEventResult() == Result.DENY) {
@@ -685,7 +687,7 @@ public final class FlagCommand extends Command {
                             .build()
             );
             // Default value
-            final String defaultValue = player.getCurrentPlot().getArea().getFlagContainer()
+            final String defaultValue = player.getLocation().getPlotArea().getFlagContainer()
                     .getFlagErased(plotFlag.getClass()).toString();
             player.sendMessage(
                     TranslatableCaption.of("flag.flag_info_default_value"),

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

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

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

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

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.getCurrentPlot().getWorldName();
+        final String world = player.getLocation().getWorldName();
         if (!this.plotAreaManager.hasPlotArea(world)) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
             return false;

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

@@ -20,6 +20,7 @@ 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;
 
@@ -35,7 +36,8 @@ public class Middle extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] arguments) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlot();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;

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

@@ -20,6 +20,7 @@ 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;
@@ -54,7 +55,8 @@ public class Move extends SubCommand {
             RunnableVal3<Command, Runnable, Runnable> confirm,
             RunnableVal2<Command, CommandResult> whenDone
     ) {
-        Plot plot1 = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot1 = location.getPlotAbs();
         if (plot1 == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return CompletableFuture.completedFuture(false);

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

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

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

@@ -21,6 +21,7 @@ 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.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -55,7 +56,8 @@ public class Remove extends SubCommand {
 
     @Override
     public boolean onCommand(PlotPlayer<?> player, String[] args) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return false;
@@ -130,7 +132,8 @@ public class Remove extends SubCommand {
 
     @Override
     public Collection<Command> tab(final PlotPlayer<?> player, final String[] args, final boolean space) {
-        Plot plot = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
         if (plot == null) {
             return Collections.emptyList();
         }

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

@@ -22,6 +22,7 @@ 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;
@@ -101,7 +102,8 @@ public class SchematicCmd extends SubCommand {
                     );
                     break;
                 }
-                final Plot plot = player.getCurrentPlot();
+                Location loc = player.getLocation();
+                final Plot plot = loc.getPlotAbs();
                 if (plot == null) {
                     player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
                     return false;
@@ -245,7 +247,8 @@ public class SchematicCmd extends SubCommand {
                     player.sendMessage(TranslatableCaption.of("error.task_in_process"));
                     return false;
                 }
-                Plot plot = player.getCurrentPlot();
+                Location location = player.getLocation();
+                Plot plot = location.getPlotAbs();
                 if (plot == null) {
                     player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
                     return false;

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.getCurrentPlot().getArea();
+                final PlotArea plotArea = player.getLocation().getPlotArea();
                 if (plotArea == null) {
                     return false;
                 }

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

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

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

@@ -19,6 +19,7 @@
 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;
@@ -43,7 +44,8 @@ public class Swap extends SubCommand {
             RunnableVal3<Command, Runnable, Runnable> confirm,
             RunnableVal2<Command, CommandResult> whenDone
     ) {
-        Plot plot1 = player.getCurrentPlot();
+        Location location = player.getLocation();
+        Plot plot1 = location.getPlotAbs();
         if (plot1 == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));
             return CompletableFuture.completedFuture(false);
@@ -77,10 +79,8 @@ public class Swap extends SubCommand {
         String p1 = plot1.toString();
         String p2 = plot2.toString();
 
-        return plot1.getPlotModificationManager().move(
+        return plot1.getPlotModificationManager().move(plot2, player, () -> {
-                plot2, player, () -> {
+        }, true).thenApply(result -> {
-                }, true
-        ).thenApply(result -> {
             if (result) {
                 player.sendMessage(
                         TranslatableCaption.of("swap.swap_success"),

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

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

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

@@ -290,7 +290,6 @@ 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)) {
@@ -320,7 +319,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      */
     public int getPlotCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getPlotCount(getCurrentPlot().getWorldName());
+            return getPlotCount(getLocation().getWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         final UUID uuid = getUUID();
@@ -340,7 +339,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     public int getClusterCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getClusterCount(getCurrentPlot().getWorldName());
+            return getClusterCount(getLocation().getWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         this.plotAreaManager.forEachPlotArea(value -> {
@@ -409,12 +408,8 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     }
 
     public PlotArea getApplicablePlotArea() {
-        Plot plot = getCurrentPlot();
-        if (plot == null) {
         return this.plotAreaManager.getApplicablePlotArea(getLocation());
     }
-        return plot.getArea();
-    }
 
     @Override
     public @NonNull RequiredType getSuperCaller() {