Add 'world' placeholder to status messages

Signed-off-by: Alexander Brandes <mc.cache@web.de>
Remove snapshot repositories (#4631 )
2025-10-22 14:13:44 +02:00 · 2025-04-21 11:56:44 +02:00 · 2025-04-21 11:34:11 +02:00 · 2025-04-20 22:20:30 +02:00 · 2025-04-19 22:46:38 +00:00 · 2025-04-11 16:43:06 +00:00
38 changed files with 511 additions and 334 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -27,6 +27,7 @@ body:
      description: Which server version are you using? If your server version is not listed, it is not supported. Update to a supported version first.
      multiple: false
      options:
+        - '1.21.4'
        - '1.21.3'
        - '1.21.1'
        - '1.20.6'
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,18 +29,18 @@ jobs:
          fi
      - name: Publish Release
        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
-        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
        env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
      - name: Publish Snapshot
        if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-        run: ./gradlew publishToSonatype
+        run: ./gradlew publishAllPublicationsToMavenCentralRepository
        env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
      - name: Publish core javadoc
        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
        uses: cpina/github-action-push-to-another-repository@main
--- a/.github/workflows/label-merge-conflicts.yaml
+++ b/.github/workflows/label-merge-conflicts.yaml
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Label conflicting PRs
-        uses: eps1lon/actions-label-merge-conflict@v3.0.2
+        uses: eps1lon/actions-label-merge-conflict@v3.0.3
        with:
          dirtyLabel: "unresolved-merge-conflict"
          repoToken: "${{ secrets.GITHUB_TOKEN }}"
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 repositories {
    maven {
        name = "PlaceholderAPI"
-        url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+        url = uri("https://repo.extendedclip.com/releases/")
    }

    maven {
@@ -39,7 +39,9 @@ dependencies {
    }
    compileOnly(libs.placeholderapi)
    compileOnly(libs.luckperms)
-    compileOnly(libs.essentialsx)
+    compileOnly(libs.essentialsx) {
+        exclude(group = "org.spigotmc")
+    }
    compileOnly(libs.mvdwapi) { isTransitive = false }

    // Other libraries
@@ -101,7 +103,7 @@ tasks {
    withType<Javadoc> {
        val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
        val opt = options as StandardJavadocDocletOptions
-        opt.links("https://jd.papermc.io/paper/1.20/")
+        opt.links("https://jd.papermc.io/paper/1.20.4/")
        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
        opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
        opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@@ -789,22 +789,23 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                    if (entity.getMetadata("ps_custom_spawned").stream().anyMatch(MetadataValue::asBoolean)) {
                        continue;
                    }
+                    // TODO: use (type) pattern matching when targeting java 21
                    switch (entity.getType().toString()) {
                        case "EGG":
-                        case "FISHING_HOOK":
-                        case "ENDER_SIGNAL":
+                        case "FISHING_HOOK", "FISHING_BOBBER":
+                        case "ENDER_SIGNAL", "EYE_OF_ENDER":
                        case "AREA_EFFECT_CLOUD":
                        case "EXPERIENCE_ORB":
-                        case "LEASH_HITCH":
-                        case "FIREWORK":
-                        case "LIGHTNING":
+                        case "LEASH_HITCH", "LEASH_KNOT":
+                        case "FIREWORK", "FIREWORK_ROCKET":
+                        case "LIGHTNING", "LIGHTNING_BOLT":
                        case "WITHER_SKULL":
                        case "UNKNOWN":
                        case "PLAYER":
                            // non moving / unmovable
                            continue;
-                        case "THROWN_EXP_BOTTLE":
-                        case "SPLASH_POTION":
+                        case "THROWN_EXP_BOTTLE", "EXPERIENCE_BOTTLE":
+                        case "SPLASH_POTION", "POTION":
                        case "SNOWBALL":
                        case "SHULKER_BULLET":
                        case "SPECTRAL_ARROW":
@@ -836,6 +837,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "TNT_MINECART":
                        case "CHEST_BOAT":
                        case "BOAT":
+                        case "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
+                             "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT":
+                        case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT",
+                             "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT",
+                             "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT":
                            if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
                                com.plotsquared.core.location.Location location = BukkitUtil.adapt(entity.getLocation());
                                Plot plot = location.getPlot();
@@ -864,14 +870,14 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "SMALL_FIREBALL":
                        case "FIREBALL":
                        case "DRAGON_FIREBALL":
-                        case "DROPPED_ITEM":
+                        case "DROPPED_ITEM", "ITEM":
                            if (Settings.Enabled_Components.KILL_ROAD_ITEMS
                                    && plotArea.getOwnedPlotAbs(BukkitUtil.adapt(entity.getLocation())) == null) {
                                this.removeRoadEntity(entity, iterator);
                            }
                            // dropped item
                            continue;
-                        case "PRIMED_TNT":
+                        case "PRIMED_TNT", "TNT":
                        case "FALLING_BLOCK":
                            // managed elsewhere
                            continue;
@@ -949,7 +955,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "HORSE":
                        case "IRON_GOLEM":
                        case "MAGMA_CUBE":
-                        case "MUSHROOM_COW":
+                        case "MUSHROOM_COW", "MOOSHROOM":
                        case "OCELOT":
                        case "PIG":
                        case "PIG_ZOMBIE":
@@ -958,7 +964,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        case "SILVERFISH":
                        case "SKELETON":
                        case "SLIME":
-                        case "SNOWMAN":
+                        case "SNOWMAN", "SNOW_GOLEM":
                        case "SPIDER":
                        case "SQUID":
                        case "VILLAGER":
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
@@ -25,7 +25,6 @@ import org.bukkit.Art;
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
 import org.bukkit.Rotation;
-import org.bukkit.TreeSpecies;
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.AbstractHorse;
@@ -34,6 +33,7 @@ import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Bat;
 import org.bukkit.entity.Boat;
 import org.bukkit.entity.Breedable;
+import org.bukkit.entity.ChestBoat;
 import org.bukkit.entity.ChestedHorse;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
@@ -44,7 +44,6 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Rabbit;
 import org.bukkit.entity.Sheep;
-import org.bukkit.entity.Slime;
 import org.bukkit.entity.Tameable;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.InventoryHolder;
@@ -103,11 +102,19 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            this.noGravity = true;
        }
        switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
+                 "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> {
                Boat boat = (Boat) entity;
-                this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
+                this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
                return;
            }
+            case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT",
+                 "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT",
+                 "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT" -> {
+                ChestBoat boat = (ChestBoat) entity;
+                this.dataByte = getOrdinal(Boat.Type.values(), boat.getBoatType());
+                storeInventory(boat);
+            }
            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
                    "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
                    "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
@@ -117,7 +124,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return;
            }
            // MISC //
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM", "ITEM" -> {
                Item item = (Item) entity;
                this.stack = item.getItemStack();
                return;
@@ -147,14 +154,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            }
            // END MISC //
            // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> {
                storeInventory((InventoryHolder) entity);
                return;
            }
            // START LIVING ENTITY //
            // START AGEABLE //
            // START TAMEABLE //
-            case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
+            case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> {
                AbstractHorse horse = (AbstractHorse) entity;
                this.horse = new HorseStats();
                this.horse.jump = horse.getJumpStrength();
@@ -172,14 +179,13 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return;
            }
            // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF", "OCELOT", "CAT", "PARROT" -> {
                storeTameable((Tameable) entity);
                storeBreedable((Breedable) entity);
                storeLiving((LivingEntity) entity);
                return;
            }
            // END TAMEABLE //
-            //todo fix sheep
            case "SHEEP" -> {
                Sheep sheep = (Sheep) entity;
                if (sheep.isSheared()) {
@@ -187,7 +193,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                } else {
                    this.dataByte = (byte) 0;
                }
-                this.dataByte2 = sheep.getColor().getDyeData();
+                this.dataByte2 = getOrdinal(DyeColor.values(), sheep.getColor());
                storeBreedable(sheep);
                storeLiving(sheep);
                return;
@@ -268,7 +274,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            }
            case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
                    "ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
-                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
+                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN", "SNOW_GOLEM" -> {
                storeLiving((LivingEntity) entity);
                return;
            }
@@ -450,7 +456,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
        }
        Entity entity;
        switch (this.getType().toString()) {
-            case "DROPPED_ITEM" -> {
+            case "DROPPED_ITEM", "ITEM" -> {
                return world.dropItem(location, this.stack);
            }
            case "PLAYER", "LEASH_HITCH" -> {
@@ -486,15 +492,25 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            entity.setGravity(false);
        }
        switch (entity.getType().toString()) {
-            case "BOAT" -> {
+            case "BOAT", "ACACIA_BOAT", "BIRCH_BOAT", "CHERRY_BOAT", "DARK_OAK_BOAT", "JUNGLE_BOAT", "MANGROVE_BOAT",
+                 "OAK_BOAT", "PALE_OAK_BOAT", "SPRUCE_BOAT", "BAMBOO_RAFT" -> {
                Boat boat = (Boat) entity;
-                boat.setWoodType(TreeSpecies.values()[dataByte]);
+                boat.setBoatType(Boat.Type.values()[dataByte]);
                return entity;
            }
-            case "SLIME" -> {
+            case "ACACIA_CHEST_BOAT", "BIRCH_CHEST_BOAT", "CHERRY_CHEST_BOAT", "DARK_OAK_CHEST_BOAT",
+                 "JUNGLE_CHEST_BOAT", "MANGROVE_CHEST_BOAT", "OAK_CHEST_BOAT", "PALE_OAK_CHEST_BOAT",
+                 "SPRUCE_CHEST_BOAT", "BAMBOO_CHEST_RAFT" -> {
+                ChestBoat boat = (ChestBoat) entity;
+                boat.setBoatType(Boat.Type.values()[dataByte]);
+                restoreInventory(boat);
+                return entity;
+            }
+            // SLIME is not even stored
+            /* case "SLIME" -> {
                ((Slime) entity).setSize(this.dataByte);
                return entity;
-            }
+            } */
            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
                    "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
                    "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
@@ -518,14 +534,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
            }
            // END MISC //
            // INVENTORY HOLDER //
-            case "MINECART_CHEST", "MINECART_HOPPER" -> {
+            case "MINECART_CHEST", "CHEST_MINECART", "MINECART_HOPPER", "HOPPER_MINECART" -> {
                restoreInventory((InventoryHolder) entity);
                return entity;
            }
            // START LIVING ENTITY //
            // START AGEABLE //
            // START TAMEABLE //
-            case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
+            case "CAMEL", "HORSE", "DONKEY", "LLAMA", "TRADER_LLAMA", "MULE", "SKELETON_HORSE", "ZOMBIE_HORSE" -> {
                AbstractHorse horse = (AbstractHorse) entity;
                horse.setJumpStrength(this.horse.jump);
                if (horse instanceof ChestedHorse) {
@@ -542,7 +558,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return entity;
            }
            // END INVENTORY HOLDER //
-            case "WOLF", "OCELOT" -> {
+            case "WOLF", "OCELOT", "CAT", "PARROT" -> {
                restoreTameable((Tameable) entity);
                restoreBreedable((Breedable) entity);
                restoreLiving((LivingEntity) entity);
@@ -555,7 +571,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                    sheep.setSheared(true);
                }
                if (this.dataByte2 != 0) {
-                    sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
+                    sheep.setColor(DyeColor.values()[this.dataByte2]);
                }
                restoreBreedable(sheep);
                restoreLiving(sheep);
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java
@@ -134,7 +134,7 @@ public class BlockEventListener117 implements Listener {
    public void onBlockFertilize(BlockFertilizeEvent event) {
        Block block = event.getBlock();
        List<org.bukkit.block.BlockState> blocks = event.getBlocks();
-        Location location = BukkitUtil.adapt(blocks.get(0).getLocation());
+        Location location = BukkitUtil.adapt(block.getLocation());

        PlotArea area = location.getPlotArea();
        if (area == null) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
@@ -42,6 +42,7 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlotFlagUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.util.Enums;
 import com.sk89q.worldedit.world.block.BlockType;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Material;
@@ -57,6 +58,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Vehicle;
+import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -78,10 +80,17 @@ import org.checkerframework.checker.nullness.qual.NonNull;

 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;

@SuppressWarnings("unused")
 public class EntityEventListener implements Listener {

+    private static final Particle EXPLOSION_HUGE = Objects.requireNonNull(Enums.findByValue(
+            Particle.class,
+            "EXPLOSION_EMITTER",
+            "EXPLOSION_HUGE"
+    ));
+
    private final BukkitPlatform platform;
    private final PlotAreaManager plotAreaManager;
    private final EventDispatcher eventDispatcher;
@@ -314,7 +323,7 @@ public class EntityEventListener implements Listener {
                if (this.lastRadius != 0) {
                    List<Entity> nearby = event.getEntity().getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
                    for (Entity near : nearby) {
-                        if (near instanceof TNTPrimed || near.getType().equals(EntityType.MINECART_TNT)) {
+                        if (near instanceof TNTPrimed || near instanceof ExplosiveMinecart) {
                            if (!near.hasMetadata("plot")) {
                                near.setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot));
                            }
@@ -338,7 +347,7 @@ public class EntityEventListener implements Listener {
        event.setCancelled(true);
        //Spawn Explosion Particles when enabled in settings
        if (Settings.General.ALWAYS_SHOW_EXPLOSIONS) {
-            event.getLocation().getWorld().spawnParticle(Particle.EXPLOSION_HUGE, event.getLocation(), 0);
+            event.getLocation().getWorld().spawnParticle(EXPLOSION_HUGE, event.getLocation(), 0);
        }
    }

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
@@ -31,8 +31,10 @@ import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.EnderCrystal;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Item;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -132,7 +134,7 @@ public class EntitySpawnListener implements Listener {
        Plot plot = location.getOwnedPlotAbs();
        EntityType type = entity.getType();
        if (plot == null) {
-            if (type == EntityType.DROPPED_ITEM) {
+            if (entity instanceof Item) {
                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                    event.setCancelled(true);
                }
@@ -154,7 +156,7 @@ public class EntitySpawnListener implements Listener {
        if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
            event.setCancelled(true);
        }
-        if (type == EntityType.ENDER_CRYSTAL || type == EntityType.ARMOR_STAND) {
+        if (entity instanceof EnderCrystal || type == EntityType.ARMOR_STAND) {
            if (BukkitEntityUtil.checkEntity(entity, plot)) {
                event.setCancelled(true);
            }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
@@ -47,10 +47,12 @@ import com.plotsquared.core.plot.flag.implementations.TileDropFlag;
 import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.PlotFlagUtil;
+import io.papermc.paper.event.entity.EntityMoveEvent;
 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.bukkit.Chunk;
+import org.bukkit.NamespacedKey;
 import org.bukkit.block.Block;
 import org.bukkit.block.TileState;
 import org.bukkit.entity.Entity;
@@ -58,6 +60,7 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -78,6 +81,9 @@ import java.util.regex.Pattern;
@SuppressWarnings("unused")
 public class PaperListener implements Listener {

+    private static final NamespacedKey ITEM = NamespacedKey.minecraft("item");
+    private static final NamespacedKey FISHING_BOBBER = NamespacedKey.minecraft("fishing_bobber");
+
    private final PlotAreaManager plotAreaManager;
    private Chunk lastChunk;

@@ -104,33 +110,7 @@ public class PaperListener implements Listener {
        if (!Settings.Paper_Components.ENTITY_PATHING) {
            return;
        }
-        Location toLoc = BukkitUtil.adapt(event.getLoc());
-        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
-        PlotArea tarea = toLoc.getPlotArea();
-        if (tarea == null) {
-            return;
-        }
-        PlotArea farea = fromLoc.getPlotArea();
-        if (farea == null) {
-            return;
-        }
-        if (tarea != farea) {
-            event.setCancelled(true);
-            return;
-        }
-        Plot tplot = toLoc.getPlot();
-        Plot fplot = fromLoc.getPlot();
-        if (tplot == null ^ fplot == null) {
-            event.setCancelled(true);
-            return;
-        }
-        if (tplot == null || tplot.getId().hashCode() == fplot.getId().hashCode()) {
-            return;
-        }
-        if (fplot.isMerged() && fplot.getConnectedPlots().contains(fplot)) {
-            return;
-        }
-        event.setCancelled(true);
+        handleEntityMovement(event, event.getEntity().getLocation(), event.getLoc());
    }

    @EventHandler
@@ -145,8 +125,23 @@ public class PaperListener implements Listener {
            return;
        }

-        Location toLoc = BukkitUtil.adapt(b.getLocation());
-        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
+        handleEntityMovement(event, event.getEntity().getLocation(),  b.getLocation());
+    }
+
+    @EventHandler
+    public void onEntityMove(EntityMoveEvent event) {
+        if (!Settings.Paper_Components.ENTITY_MOVEMENT) {
+            return;
+        }
+        if (!event.hasExplicitlyChangedBlock()) {
+            return;
+        }
+        handleEntityMovement(event, event.getFrom(), event.getTo());
+    }
+
+    private static void handleEntityMovement(Cancellable event, org.bukkit.Location from, org.bukkit.Location target) {
+        Location toLoc = BukkitUtil.adapt(target);
+        Location fromLoc = BukkitUtil.adapt(from);
        PlotArea tarea = toLoc.getPlotArea();
        if (tarea == null) {
            return;
@@ -155,7 +150,6 @@ public class PaperListener implements Listener {
        if (farea == null) {
            return;
        }
-
        if (tarea != farea) {
            event.setCancelled(true);
            return;
@@ -166,10 +160,10 @@ public class PaperListener implements Listener {
            event.setCancelled(true);
            return;
        }
-        if (tplot == null || tplot.getId().hashCode() == fplot.getId().hashCode()) {
+        if (tplot == null || tplot.getId().equals(fplot.getId())) {
            return;
        }
-        if (fplot.isMerged() && fplot.getConnectedPlots().contains(fplot)) {
+        if (fplot.isMerged() && fplot.getConnectedPlots().contains(tplot)) {
            return;
        }
        event.setCancelled(true);
@@ -238,7 +232,7 @@ public class PaperListener implements Listener {
        if (plot == null) {
            EntityType type = event.getType();
            // PreCreatureSpawnEvent **should** not be called for DROPPED_ITEM, just for the sake of consistency
-            if (type == EntityType.DROPPED_ITEM) {
+            if (type.getKey().equals(ITEM)) {
                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
                    event.setCancelled(true);
                }
@@ -364,7 +358,7 @@ public class PaperListener implements Listener {
                event.setCancelled(true);
            }
        } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
+            if (entity.getType().getKey().equals(FISHING_BOBBER)) {
                if (plot.getFlag(FishingFlag.class)) {
                    return;
                }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
@@ -376,7 +376,7 @@ public class PlayerEventListener implements Listener {

    @EventHandler
    public void onVehicleEntityCollision(VehicleEntityCollisionEvent e) {
-        if (e.getVehicle().getType() == EntityType.BOAT) {
+        if (e.getVehicle() instanceof Boat) {
            Location location = BukkitUtil.adapt(e.getEntity().getLocation());
            if (location.isPlotArea()) {
                if (e.getEntity() instanceof Player) {
@@ -593,7 +593,7 @@ public class PlayerEventListener implements Listener {
                    return;
                }
                Plot plot = area.getPlot(location);
-                if (plot != null) {
+                if (plot != null && !plot.equals(lastPlot)) {
                    final boolean result = DenyTeleportFlag.allowsTeleport(pp, plot);
                    // there is one possibility to still allow teleportation:
                    // to is identical to the plot's home location, and untrusted-visit is true
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
@@ -35,7 +35,7 @@ import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
+import org.bukkit.entity.FishHook;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -134,7 +134,7 @@ public class ProjectileEventListener implements Listener {
                event.setCancelled(true);
            }
        } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
+            if (entity instanceof FishHook) {
                if (plot.getFlag(FishingFlag.class)) {
                    return;
                }
@@ -194,7 +194,7 @@ public class ProjectileEventListener implements Listener {
                return;
            }
            if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(
-                    ProjectilesFlag.class) || (entity.getType().equals(EntityType.FISHING_HOOK) && plot.getFlag(
+                    ProjectilesFlag.class) || (entity instanceof FishHook && plot.getFlag(
                    FishingFlag.class))) {
                return;
            }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitChunkCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitChunkCoordinator.java
@@ -30,6 +30,8 @@ import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.world.World;
 import io.papermc.lib.PaperLib;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.plugin.Plugin;
@@ -41,6 +43,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;

@@ -55,6 +59,8 @@ import java.util.function.Consumer;
 **/
 public final class BukkitChunkCoordinator extends ChunkCoordinator {

+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitChunkCoordinator.class.getSimpleName());
+
    private final List<ProgressSubscriber> progressSubscribers = new LinkedList<>();

    private final Queue<BlockVector2> requestedChunks;
@@ -70,6 +76,7 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
    private final AtomicInteger expectedSize;
    private final AtomicInteger loadingChunks = new AtomicInteger();
    private final boolean forceSync;
+    private final boolean shouldGen;

    private int batchSize;
    private PlotSquaredTask task;
@@ -87,7 +94,8 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
            @Assisted final @NonNull Consumer<Throwable> throwableConsumer,
            @Assisted("unloadAfter") final boolean unloadAfter,
            @Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers,
-            @Assisted("forceSync") final boolean forceSync
+            @Assisted("forceSync") final boolean forceSync,
+            @Assisted("shouldGen") final boolean shouldGen
    ) {
        this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks);
        this.availableChunks = new LinkedBlockingQueue<>();
@@ -103,6 +111,7 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
        this.bukkitWorld = Bukkit.getWorld(world.getName());
        this.progressSubscribers.addAll(progressSubscribers);
        this.forceSync = forceSync;
+        this.shouldGen = shouldGen;
    }

    @Override
@@ -212,18 +221,28 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
     * Requests a batch of chunks to be loaded
     */
    private void requestBatch() {
-        BlockVector2 chunk;
-        for (int i = 0; i < this.batchSize && (chunk = this.requestedChunks.poll()) != null; i++) {
+        for (int i = 0; i < this.batchSize && this.requestedChunks.peek() != null; i++) {
            // This required PaperLib to be bumped to version 1.0.4 to mark the request as urgent
+            final BlockVector2 chunk = this.requestedChunks.poll();
            loadingChunks.incrementAndGet();
            PaperLib
-                    .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), true, true)
+                    .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), shouldGen, true)
+                    .orTimeout(10L, TimeUnit.SECONDS)
                    .whenComplete((chunkObject, throwable) -> {
                        loadingChunks.decrementAndGet();
                        if (throwable != null) {
-                            throwable.printStackTrace();
+                            if (throwable instanceof TimeoutException) {
+                                LOGGER.warn("Timed out awaiting chunk load {}", chunk);
+                                this.requestedChunks.offer(chunk);
+                            } else {
+                                LOGGER.error("Failed to load chunk {}", chunk, throwable);
                                // We want one less because this couldn't be processed
                                this.expectedSize.decrementAndGet();
+                            }
+                        } else if (chunkObject == null) {
+                            if (shouldGen) {
+                                LOGGER.error("Null chunk returned for chunk at {}", chunk);
+                            }
                        } else if (PlotSquared.get().isMainThread(Thread.currentThread())) {
                            this.processChunk(chunkObject);
                        } else {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
@@ -62,19 +62,28 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
    private static final SideEffectSet EDGE_LIGHTING_SIDE_EFFECT_SET;

    static {
-        NO_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.LIGHTING, SideEffect.State.OFF).with(
-                SideEffect.NEIGHBORS,
-                SideEffect.State.OFF
-        );
-        EDGE_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
-                SideEffect.NEIGHBORS,
-                SideEffect.State.ON
-        );
-        LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
-        EDGE_LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
-                SideEffect.NEIGHBORS,
-                SideEffect.State.ON
-        );
+        NO_SIDE_EFFECT_SET = enableNetworkIfNeeded()
+                .with(SideEffect.LIGHTING, SideEffect.State.OFF)
+                .with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
+        EDGE_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
+                .with(SideEffect.UPDATE, SideEffect.State.ON)
+                .with(SideEffect.NEIGHBORS, SideEffect.State.ON);
+        LIGHTING_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
+                .with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
+        EDGE_LIGHTING_SIDE_EFFECT_SET = NO_SIDE_EFFECT_SET
+                .with(SideEffect.UPDATE, SideEffect.State.ON)
+                .with(SideEffect.NEIGHBORS, SideEffect.State.ON);
+    }
+
+    // make sure block changes are sent
+    private static SideEffectSet enableNetworkIfNeeded() {
+        SideEffect network;
+        try {
+            network = SideEffect.valueOf("NETWORK");
+        } catch (IllegalArgumentException ignored) {
+            return SideEffectSet.none();
+        }
+        return SideEffectSet.none().with(network, SideEffect.State.ON);
    }

    private org.bukkit.World bukkitWorld;
@@ -229,6 +238,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator {
                        .unloadAfter(isUnloadAfter())
                        .withProgressSubscribers(getProgressSubscribers())
                        .forceSync(isForceSync())
+                        .shouldGen(isShouldGen())
                        .build();
        return super.enqueue();
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java
@@ -49,6 +49,7 @@ import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Firework;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.entity.EntityDamageEvent;
@@ -341,8 +342,7 @@ public class BukkitEntityUtil {
        }
        //disable the firework damage. too much of a headache to support at the moment.
        if (vplot != null) {
-            if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause
-                    && damager.getType() == EntityType.FIREWORK) {
+            if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause && damager instanceof Firework) {
                return false;
            }
        }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
@@ -262,6 +262,11 @@ public class BukkitUtil extends WorldUtil {
        });
    }

+    @Override
+    public boolean isSmallBlock(Location location) {
+        return adapt(location).getBlock().getBoundingBox().getHeight() < 0.25;
+    }
+
    @Override
    @NonNegative
    public int getHighestBlockSynchronous(final @NonNull String world, final int x, final int z) {
--- a/Core/src/main/java/com/plotsquared/core/command/Buy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Buy.java
@@ -144,6 +144,7 @@ public class Buy extends Command {
            plot.getPlotModificationManager().setSign(player.getName());
            player.sendMessage(
                    TranslatableCaption.of("working.claimed"),
+                    TagResolver.resolver("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))),
                    TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
            );
            this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);
--- a/Core/src/main/java/com/plotsquared/core/command/Clear.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Clear.java
@@ -131,6 +131,7 @@ public class Clear extends Command {
                    player.sendMessage(
                            TranslatableCaption.of("working.clearing_done"),
                            TagResolver.builder()
+                                    .tag("world", Tag.inserting(Component.text(plot.getArea().getWorldName())))
                                    .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
                                    .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
                                    .build()
--- a/Core/src/main/java/com/plotsquared/core/command/Delete.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Delete.java
@@ -124,6 +124,7 @@ public class Delete extends SubCommand {
                                "amount",
                                Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
                        ),
+                        TagResolver.resolver("world", Tag.inserting(Component.text(plotArea.getWorldName()))),
                        TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
                );
                eventDispatcher.callPostDelete(plot);
--- a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
@@ -44,8 +44,13 @@ import org.apache.logging.log4j.Logger;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;

+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
 * PlotSquared command class.
 */
@@ -147,8 +152,7 @@ public class MainCommand extends Command {
                try {
                    injector.getInstance(command);
                } catch (final Exception e) {
-                    LOGGER.error("Failed to register command {}", command.getCanonicalName());
-                    e.printStackTrace();
+                    LOGGER.error("Failed to register command {}", command.getCanonicalName(), e);
                }
            }

@@ -236,110 +240,170 @@ public class MainCommand extends Command {
            RunnableVal3<Command, Runnable, Runnable> confirm,
            RunnableVal2<Command, CommandResult> whenDone
    ) {
-        // Optional command scope //
-        Location location = null;
-        Plot plot = null;
-        boolean tp = false;
-        if (args.length >= 2) {
-            PlotArea area = player.getApplicablePlotArea();
-            Plot newPlot = Plot.fromString(area, args[0]);
-            if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea()
-                    .equals(area) || player.hasPermission(Permission.PERMISSION_ADMIN)
-                    || player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
-                    && !newPlot.isDenied(player.getUUID())) {
-                final Location newLoc;
-                if (newPlot.getArea() instanceof SinglePlotArea) {
-                    newLoc = newPlot.isLoaded() ? newPlot.getCenterSynchronous() : Location.at("", 0, 0, 0);
-                } else {
-                    newLoc = newPlot.getCenterSynchronous();
-                }
-                if (player.canTeleport(newLoc)) {
-                    // Save meta
-                    try (final MetaDataAccess<Location> locationMetaDataAccess
-                                 = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
-                        location = locationMetaDataAccess.get().orElse(null);
-                        locationMetaDataAccess.set(newLoc);
-                    }
-                    try (final MetaDataAccess<Plot> plotMetaDataAccess
-                                 = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
-                        plot = plotMetaDataAccess.get().orElse(null);
-                        plotMetaDataAccess.set(newPlot);
-                    }
-                    tp = true;
-                } else {
-                    player.sendMessage(TranslatableCaption.of("border.denied"));
+        prepareArguments(new CommandExecutionData(player, args, confirm, whenDone, null))
+                .thenCompose(executionData -> {
+                    if (executionData.isEmpty()) {
                        return CompletableFuture.completedFuture(false);
                    }
-                // Trim command
-                args = Arrays.copyOfRange(args, 1, args.length);
+                    var data = executionData.get();
+                    try {
+                        return super.execute(data.player(), data.args(), data.confirm(), data.whenDone());
+                    } catch (CommandException e) {
+                        throw e;
+                    } catch (Throwable e) {
+                        LOGGER.error("A error occurred while executing plot command", e);
+                        String message = e.getMessage();
+                        if (message != null) {
+                            data.player().sendMessage(
+                                    TranslatableCaption.of("errors.error"),
+                                    TagResolver.resolver("value", Tag.inserting(Component.text(message)))
+                            );
+                        } else {
+                            data.player().sendMessage(
+                                    TranslatableCaption.of("errors.error_console"));
                        }
-            if (args.length >= 2 && !args[0].isEmpty() && args[0].charAt(0) == '-') {
-                if ("f".equals(args[0].substring(1))) {
-                    confirm = new RunnableVal3<>() {
+                    } finally {
+                        if (data.postCommandData() != null) {
+                            resetCommandScope(data.player(), data.postCommandData());
+                        }
+                    }
+                    return CompletableFuture.completedFuture(true);
+                });
+        return CompletableFuture.completedFuture(true);
+    }
+
+    private CompletableFuture<Optional<CommandExecutionData>> prepareArguments(CommandExecutionData data) {
+        if (data.args().length >= 2) {
+            PlotArea area = data.player().getApplicablePlotArea();
+            Plot newPlot = Plot.fromString(area, data.args()[0]);
+            return preparePlotArgument(newPlot, data, area)
+                    .thenApply(d -> d.flatMap(x -> prepareFlagArgument(x, area)));
+        } else {
+            return CompletableFuture.completedFuture(Optional.of(data));
+        }
+    }
+
+    private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(@Nullable Plot newPlot,
+                                                                        @Nonnull CommandExecutionData data,
+                                                                                  @Nullable PlotArea area) {
+        if (newPlot != null && (data.player() instanceof ConsolePlayer
+                || (area != null && area.equals(newPlot.getArea()))
+                || data.player().hasPermission(Permission.PERMISSION_ADMIN)
+                || data.player().hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
+                && !newPlot.isDenied(data.player().getUUID())) {
+            return fetchPlotCenterLocation(newPlot)
+                    .thenApply(newLoc -> {
+                        if (!data.player().canTeleport(newLoc)) {
+                            data.player().sendMessage(TranslatableCaption.of("border.denied"));
+                            return Optional.empty();
+                        }
+                        // Save meta
+                        var originalCommandMeta = setCommandScope(data.player(), new TemporaryCommandMeta(newLoc, newPlot));
+                        return Optional.of(new CommandExecutionData(
+                                data.player(),
+                                Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
+                                data.confirm(),
+                                data.whenDone(),
+                                originalCommandMeta
+                        ));
+                    });
+        }
+        return CompletableFuture.completedFuture(Optional.of(data));
+    }
+
+    private Optional<CommandExecutionData> prepareFlagArgument(@Nonnull CommandExecutionData data, @Nonnull PlotArea area) {
+        if (data.args().length >= 2 && !data.args()[0].isEmpty() && data.args()[0].charAt(0) == '-') {
+            if ("f".equals(data.args()[0].substring(1))) {
+                return Optional.of(new CommandExecutionData(
+                        data.player(),
+                        Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
+                        createForcedConfirmation(data.player(), area),
+                        data.whenDone(),
+                        data.postCommandData()
+                ));
+            } else {
+                data.player().sendMessage(TranslatableCaption.of("errors.invalid_command_flag"));
+                return Optional.empty();
+            }
+        }
+        return Optional.of(data);
+    }
+
+    private CompletableFuture<Location> fetchPlotCenterLocation(Plot plot) {
+        if (plot.getArea() instanceof SinglePlotArea && !plot.isLoaded()) {
+            return CompletableFuture.completedFuture(Location.at("", 0, 0, 0));
+        }
+        CompletableFuture<Location> future = new CompletableFuture<>();
+        plot.getCenter(future::complete);
+        return future;
+    }
+
+    private @Nonnull RunnableVal3<Command, Runnable, Runnable> createForcedConfirmation(@Nonnull PlotPlayer<?> player,
+                                                                                        @Nullable PlotArea area) {
+        return new RunnableVal3<>() {
            @Override
            public void run(Command cmd, Runnable success, Runnable failure) {
-                            if (area != null && PlotSquared.platform().econHandler().isEnabled(area)) {
-                                PlotExpression priceEval =
-                                        area.getPrices().get(cmd.getFullId());
-                                double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
-                                if (price != 0d
-                                        && PlotSquared.platform().econHandler().getMoney(player) < price) {
+                if (area != null && PlotSquared.platform().econHandler().isEnabled(area)
+                        && Optional.of(area.getPrices().get(cmd.getFullId()))
+                        .map(priceEval -> priceEval.evaluate(0d))
+                        .filter(price -> price != 0d)
+                        .filter(price -> PlotSquared.platform().econHandler().getMoney(player) < price)
+                        .isPresent()) {
                    if (failure != null) {
                        failure.run();
                    }
                    return;
                }
-                            }
                if (success != null) {
                    success.run();
                }
            }
        };
-                    args = Arrays.copyOfRange(args, 1, args.length);
-                } else {
-                    player.sendMessage(TranslatableCaption.of("errors.invalid_command_flag"));
-                    return CompletableFuture.completedFuture(false);
    }
-            }
-        }
-        try {
-            super.execute(player, args, confirm, whenDone);
-        } catch (CommandException e) {
-            throw e;
-        } catch (Throwable e) {
-            e.printStackTrace();
-            String message = e.getMessage();
-            if (message != null) {
-                player.sendMessage(
-                        TranslatableCaption.of("errors.error"),
-                        TagResolver.resolver("value", Tag.inserting(Component.text(message)))
-                );
-            } else {
-                player.sendMessage(
-                        TranslatableCaption.of("errors.error_console"));
-            }
-        }
-        // Reset command scope //
-        if (tp && !(player instanceof ConsolePlayer)) {
+
+    private @Nonnull TemporaryCommandMeta setCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) {
+        Objects.requireNonNull(commandMeta.location());
+        Objects.requireNonNull(commandMeta.plot());
+        Location location;
+        Plot plot;
        try (final MetaDataAccess<Location> locationMetaDataAccess
                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
-                if (location == null) {
+            location = locationMetaDataAccess.get().orElse(null);
+            locationMetaDataAccess.set(commandMeta.location());
+        }
+        try (final MetaDataAccess<Plot> plotMetaDataAccess
+                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
+            plot = plotMetaDataAccess.get().orElse(null);
+            plotMetaDataAccess.set(commandMeta.plot());
+        }
+        return new TemporaryCommandMeta(location, plot);
+    }
+
+    private void resetCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) {
+        try (final MetaDataAccess<Location> locationMetaDataAccess
+                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
+            if (commandMeta.location() == null) {
                locationMetaDataAccess.remove();
            } else {
-                    locationMetaDataAccess.set(location);
+                locationMetaDataAccess.set(commandMeta.location());
            }
        }
        try (final MetaDataAccess<Plot> plotMetaDataAccess
                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
-                if (plot == null) {
+            if (commandMeta.plot() == null) {
                plotMetaDataAccess.remove();
            } else {
-                    plotMetaDataAccess.set(plot);
+                plotMetaDataAccess.set(commandMeta.plot());
            }
        }
    }
-        return CompletableFuture.completedFuture(true);
-    }
+
+    private record CommandExecutionData(@Nonnull PlotPlayer<?> player, @Nonnull String[] args,
+                    @Nonnull RunnableVal3<Command, Runnable, Runnable> confirm,
+                    @Nonnull RunnableVal2<Command, CommandResult> whenDone,
+                    @Nullable TemporaryCommandMeta postCommandData) {}
+
+    private record TemporaryCommandMeta(@Nullable Location location, @Nullable Plot plot) {}

    @Override
    public boolean canExecute(PlotPlayer<?> player, boolean message) {
--- a/Core/src/main/java/com/plotsquared/core/command/Music.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Music.java
@@ -60,6 +60,9 @@ public class Music extends SubCommand {
                    "music_disc_creator_music_box", "music_disc_precipice"
            );

+    // make sure all discs and the bedrock ("cancel") fit into the inventory
+    private static final int INVENTORY_ROWS = (int) Math.ceil((DISCS.size() + 1) / 9.0);
+
    private final InventoryUtil inventoryUtil;
    private final EventDispatcher eventDispatcher;

@@ -94,7 +97,7 @@ public class Music extends SubCommand {
        PlotInventory inv = new PlotInventory(
                this.inventoryUtil,
                player,
-                2,
+                INVENTORY_ROWS,
                TranslatableCaption.of("plotjukebox.jukebox_header").getComponent(player)
        ) {
            @Override
--- a/Core/src/main/java/com/plotsquared/core/command/Remove.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Remove.java
@@ -117,8 +117,8 @@ public class Remove extends SubCommand {
            }
            if (count == 0) {
                player.sendMessage(
-                        TranslatableCaption.of("errors.invalid_player"),
-                        TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
+                        TranslatableCaption.of("member.player_not_removed"),
+                        TagResolver.resolver("player", Tag.inserting(Component.text(args[0])))
                );
            } else {
                player.sendMessage(
--- a/Core/src/main/java/com/plotsquared/core/configuration/Config.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Config.java
@@ -26,6 +26,7 @@ import org.apache.logging.log4j.Logger;

 import java.io.File;
 import java.io.PrintWriter;
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -372,6 +373,7 @@ public class Config {
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target({ElementType.FIELD, ElementType.TYPE})
+    @Documented
    public @interface Comment {

        String[] value();
--- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
@@ -582,6 +582,8 @@ public class Settings extends Config {
        public static boolean PER_WORLD_VISIT = false;
        @Comment("Search merged plots for having multiple owners when using the visit command")
        public static boolean VISIT_MERGED_OWNERS = true;
+        @Comment("Allows to teleport based on block size instead to spawn on the highest block at the home command")
+        public static boolean SIZED_BASED = true;

    }

@@ -651,6 +653,8 @@ public class Settings extends Config {
        public static boolean PAPER_LISTENERS = true;
        @Comment("Prevent entities from leaving plots")
        public static boolean ENTITY_PATHING = true;
+        @Comment("Prevent entities from leaving plots, even by pushing or pulling")
+        public static boolean ENTITY_MOVEMENT = false;
        @Comment(
                "Cancel entity spawns when the chunk is loaded if the PlotArea's mob spawning is off")
        public static boolean CANCEL_CHUNK_SPAWN = true;
--- a/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
+++ b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
@@ -432,6 +432,7 @@ public class HybridUtils {
                if (!UPDATE) {
                    Iterator<BlockVector2> iter = chunks.iterator();
                    QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
+                    queue.setShouldGen(false);
                    while (iter.hasNext()) {
                        BlockVector2 chunk = iter.next();
                        iter.remove();
@@ -474,6 +475,7 @@ public class HybridUtils {
                                    Iterator<BlockVector2> iterator = chunks.iterator();
                                    if (chunks.size() >= 32) {
                                        QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
+                                        queue.setShouldGen(false);
                                        for (int i = 0; i < 32; i++) {
                                            final BlockVector2 chunk = iterator.next();
                                            iterator.remove();
@@ -487,6 +489,7 @@ public class HybridUtils {
                                        return null;
                                    }
                                    QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName()));
+                                    queue.setShouldGen(false);
                                    while (!chunks.isEmpty()) {
                                        final BlockVector2 chunk = iterator.next();
                                        iterator.remove();
@@ -502,7 +505,6 @@ public class HybridUtils {
                                return;
                            }
                        } catch (Exception e) {
-                            e.printStackTrace();
                            Iterator<BlockVector2> iterator = HybridUtils.regions.iterator();
                            BlockVector2 loc = iterator.next();
                            iterator.remove();
@@ -510,7 +512,8 @@ public class HybridUtils {
                                    "Error! Could not update '{}/region/r.{}.{}.mca' (Corrupt chunk?)",
                                    area.getWorldHash(),
                                    loc.getX(),
-                                    loc.getZ()
+                                    loc.getZ(),
+                                    e
                            );
                        }
                        TaskManager.runTaskLater(task, TaskTime.seconds(1L));
@@ -558,7 +561,7 @@ public class HybridUtils {
                                try {
                                    plotworld.setupSchematics();
                                } catch (SchematicHandler.UnsupportedFormatException e) {
-                                    e.printStackTrace();
+                                    LOGGER.error(e);
                                }
                            });
                });
--- a/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java
+++ b/Core/src/main/java/com/plotsquared/core/inject/factory/ChunkCoordinatorFactory.java
@@ -40,7 +40,8 @@ public interface ChunkCoordinatorFactory {
            final @NonNull Consumer<Throwable> throwableConsumer,
            @Assisted("unloadAfter") final boolean unloadAfter,
            final @NonNull Collection<ProgressSubscriber> progressSubscribers,
-            @Assisted("forceSync") final boolean forceSync
+            @Assisted("forceSync") final boolean forceSync,
+            @Assisted("shouldGen") final boolean shouldGen
    );

 }
--- a/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
+++ b/Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
@@ -444,7 +444,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,

    /**
     * Get this player's UUID.
-     * === !IMPORTANT ===<br>
+     * <p>=== !IMPORTANT ===</p>
     * The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has
     * (especially if using an old version of Bukkit that does not support UUIDs)
     *
--- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java
@@ -1407,6 +1407,9 @@ public class Plot {
                );
            }
            Location location = toHomeLocation(bottom, home);
+            if (Settings.Teleport.SIZED_BASED && this.worldUtil.isSmallBlock(location) && this.worldUtil.isSmallBlock(location.add(0,1,0))) {
+                return location;
+            }
            if (!this.worldUtil.getBlockSynchronous(location).getBlockType().getMaterial().isAir()) {
                location = location.withY(
                        Math.max(1 + this.worldUtil.getHighestBlockSynchronous(
@@ -1440,7 +1443,11 @@ public class Plot {
            }
            Location bottom = this.getBottomAbs();
            Location location = toHomeLocation(bottom, home);
+            if (Settings.Teleport.SIZED_BASED && this.worldUtil.isSmallBlock(location) && this.worldUtil.isSmallBlock(location.add(0,1,0))) {
+                result.accept(location);
+            } else {
                this.worldUtil.getBlock(location, block -> {
+
                    if (!block.getBlockType().getMaterial().isAir()) {
                        this.worldUtil.getHighestBlock(this.getWorldName(), location.getX(), location.getZ(),
                                y -> result.accept(location.withY(Math.max(1 + y, bottom.getY())))
@@ -1450,6 +1457,8 @@ public class Plot {
                    }
                });
            }
+
+        }
    }

    private Location toHomeLocation(Location bottom, BlockLoc relativeHome) {
@@ -1708,6 +1717,7 @@ public class Plot {
        }
        player.sendMessage(
                TranslatableCaption.of("working.claimed"),
+                TagResolver.resolver("world", Tag.inserting(Component.text(this.getWorldName()))),
                TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
        );
        if (teleport) {
--- a/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/ChunkCoordinatorBuilder.java
@@ -52,6 +52,7 @@ public class ChunkCoordinatorBuilder {
    private int initialBatchSize = Settings.QUEUE.INITIAL_BATCH_SIZE;
    private boolean unloadAfter = true;
    private boolean forceSync = false;
+    private boolean shouldGen = true;

    @Inject
    public ChunkCoordinatorBuilder(@NonNull ChunkCoordinatorFactory chunkCoordinatorFactory) {
@@ -203,6 +204,19 @@ public class ChunkCoordinatorBuilder {
        return this;
    }

+    /**
+     * Set whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported
+     * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation
+     * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper).
+     *
+     * @param shouldGen should generate new chunks or not
+     * @since 7.5.0
+     */
+    public @NonNull ChunkCoordinatorBuilder shouldGen(final boolean shouldGen) {
+        this.shouldGen = shouldGen;
+        return this;
+    }
+
    public @NonNull ChunkCoordinatorBuilder withProgressSubscriber(ProgressSubscriber progressSubscriber) {
        this.progressSubscribers.add(progressSubscriber);
        return this;
@@ -234,7 +248,8 @@ public class ChunkCoordinatorBuilder {
                        this.throwableConsumer,
                        this.unloadAfter,
                        this.progressSubscribers,
-                        this.forceSync
+                        this.forceSync,
+                        this.shouldGen
                );
    }

--- a/Core/src/main/java/com/plotsquared/core/queue/DelegateQueueCoordinator.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/DelegateQueueCoordinator.java
@@ -51,6 +51,7 @@ public class DelegateQueueCoordinator extends QueueCoordinator {

        if (parent != null) {
            this.setForceSync(parent.isForceSync());
+            this.setShouldGen(parent.isShouldGen());
        }
    }

--- a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
@@ -45,6 +45,7 @@ public abstract class QueueCoordinator {

    private final AtomicBoolean enqueued = new AtomicBoolean();
    private boolean forceSync = false;
+    private boolean shouldGen = true;
    @Nullable
    private Object chunkObject;
    @SuppressWarnings({"unused", "FieldCanBeLocal"})
@@ -110,6 +111,30 @@ public abstract class QueueCoordinator {
        this.forceSync = forceSync;
    }

+
+    /**
+     * Get whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported
+     * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation
+     * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper).
+     *
+     * @since 7.5.0
+     */
+    public boolean isShouldGen() {
+        return shouldGen;
+    }
+
+    /**
+     * Set whether chunks should be generated as part of this operation. Default is true. Disabling this may not be supported
+     * depending on server implementation. (i.e. setting to false may not actually disable generation as part of this operation
+     * - this is just a catch-all in case of future differing server implementations; the option will work on Spigot/Paper).
+     *
+     * @param shouldGen should generate new chunks or not
+     * @since 7.5.0
+     */
+    public void setShouldGen(boolean shouldGen) {
+        this.shouldGen = shouldGen;
+    }
+
    /**
     * Get the Chunk Object set to the queue
     *
--- a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
+++ b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
@@ -177,6 +177,13 @@ public abstract class WorldUtil {
     */
    public abstract void getBlock(@NonNull Location location, @NonNull Consumer<BlockState> result);

+    /**
+     * Checks if the block smaller as a slab
+     * @param location Block location
+     * @return true if it smaller as a slab
+     */
+    public abstract boolean isSmallBlock(@NonNull Location location);
+
    /**
     * Get the block at a given location (synchronously)
     *
--- a/Core/src/main/resources/lang/messages_en.json
+++ b/Core/src/main/resources/lang/messages_en.json
@@ -390,11 +390,11 @@
  "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
  "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
  "working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
-  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
-  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
  "working.plot_not_claimed": "<prefix><gray>Plot not claimed.</gray>",
  "working.plot_is_claimed": "<prefix><gray>This plot is already claimed.</gray>",
-  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><plot></gold><dark_aqua>.</dark_aqua>",
+  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><world>;<plot></gold><dark_aqua>.</dark_aqua>",
  "working.progress": "<prefix><gray>Current progress: </gray><gold><progress></gold><gray>%</gray>",
  "working.component_complete": "<prefix><gold>Component generation has finished for plot <plot>.</gold>",
  "list.comment_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> comment(s):</gold>",
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,6 @@
 import com.diffplug.gradle.spotless.SpotlessPlugin
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
+import com.vanniktech.maven.publish.SonatypeHost
 import groovy.json.JsonSlurper
 import xyz.jpenilla.runpaper.task.RunServer
 import java.net.URI
@@ -7,13 +8,12 @@ import java.net.URI
 plugins {
    java
    `java-library`
-    `maven-publish`
    signing

    alias(libs.plugins.shadow)
    alias(libs.plugins.spotless)
    alias(libs.plugins.grgit)
-    alias(libs.plugins.nexus)
+    alias(libs.plugins.publish)

    eclipse
    idea
@@ -22,7 +22,7 @@ plugins {
 }

 group = "com.intellectualsites.plotsquared"
-version = "7.4.1-SNAPSHOT"
+version = "7.5.3-SNAPSHOT"

 if (!File("$rootDir/.git").exists()) {
    logger.lifecycle("""
@@ -41,16 +41,6 @@ subprojects {
    repositories {
        mavenCentral()

-        maven {
-            name = "Sonatype OSS"
-            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-        }
-
-        maven {
-            name = "Sonatype OSS (S01)"
-            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-        }
-
        maven {
            name = "Jitpack"
            url = uri("https://jitpack.io")
@@ -68,7 +58,7 @@ subprojects {
    apply {
        plugin<JavaPlugin>()
        plugin<JavaLibraryPlugin>()
-        plugin<MavenPublishPlugin>()
+        plugin<com.vanniktech.maven.publish.MavenPublishPlugin>()
        plugin<ShadowPlugin>()
        plugin<SpotlessPlugin>()
        plugin<SigningPlugin>()
@@ -79,8 +69,8 @@ subprojects {

    dependencies {
        // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.11.3")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.3")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.2")
    }

    plugins.withId("java") {
@@ -107,11 +97,6 @@ subprojects {
        }
    }

-    java {
-        withSourcesJar()
-        withJavadocJar()
-    }
-
    val javaComponent = components["java"] as AdhocComponentWithVariants
    javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
        skip()
@@ -127,14 +112,15 @@ subprojects {
        }
    }

-    publishing {
-        publications {
-            create<MavenPublication>("maven") {
-                from(components["java"])
+    mavenPublishing {
+        coordinates(
+            groupId = "$group",
+            artifactId = project.name,
+            version = "${project.version}",
+        )

        pom {
-
-                    name.set(project.name + " " + project.version)
+            name.set(project.name)
            description.set("PlotSquared, a land and world management plugin for Minecraft.")
            url.set("https://github.com/IntellectualSites/PlotSquared")

@@ -185,8 +171,8 @@ subprojects {
                system.set("GitHub")
                url.set("https://github.com/IntellectualSites/PlotSquared/issues")
            }
-                }
-            }
+
+            publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
        }
    }

@@ -194,7 +180,6 @@ subprojects {

        compileJava {
            options.compilerArgs.add("-parameters")
-            options.isDeprecation = true
            options.encoding = "UTF-8"
        }

@@ -217,20 +202,11 @@ subprojects {
    }
 }

-nexusPublishing {
-    this.repositories {
-        sonatype {
-            nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
-        }
-    }
-}
-
 tasks.getByName<Jar>("jar") {
    enabled = false
 }

-val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.3")
+val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4")
 tasks {
    register("cacheLatestFaweArtifact") {
        val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,21 +2,21 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.8.6"
-checkerqual = "3.48.3"
+spotbugs = "4.9.3"
+checkerqual = "3.49.2"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.17.0"
+adventure = "4.20.0"
 adventure-bukkit = "4.3.4"
 log4j = "2.19.0"

 # Plugins
 worldedit = "7.2.20"
-fawe = "2.12.2"
+fawe = "2.13.0"
 placeholderapi = "2.11.6"
 luckperms = "5.4"
-essentialsx = "2.20.1"
+essentialsx = "2.21.0"
 mvdwapi = "3.1.1"

 # Third party
@@ -30,13 +30,13 @@ bstats = "3.1.0"
 paperlib = "1.0.8"
 informative-annotations = "1.5"
 vault = "1.7.1"
-serverlib = "2.3.6"
+serverlib = "2.3.7"

 # Gradle plugins
-shadow = "8.3.5"
+shadow = "8.3.6"
 grgit = "4.1.1"
-spotless = "6.25.0"
-nexus = "2.0.0"
+spotless = "7.0.3"
+publish = "0.31.0"
 runPaper = "2.3.1"

 [libraries]
@@ -81,5 +81,5 @@ serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.re
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
-nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
+publish = { id = "com.vanniktech.maven.publish", version.ref = "publish" }
 runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/5
+++ b/5
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
Author	SHA1	Message	Date
Alexander Brandes	dcd87131dd	Add 'world' placeholder to status messages Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-04-21 11:56:44 +02:00
Alexander Brandes	9626302f04	Remove snapshot repositories (#4631 ) * Remove snapshot repositories Signed-off-by: Alexander Brandes <mc.cache@web.de> * Update Papi location Signed-off-by: Alexander Brandes <mc.cache@web.de> --------- Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-04-21 11:34:11 +02:00
Alexander Brandes	1b4a347e8b	Move to new publishing portal (#4630 ) * Move to new publishing portal Signed-off-by: Alexander Brandes <mc.cache@web.de> * Use new variables Signed-off-by: Alexander Brandes <mc.cache@web.de> * Try snapshot Signed-off-by: Alexander Brandes <mc.cache@web.de> * Back to main Signed-off-by: Alexander Brandes <mc.cache@web.de> --------- Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-04-20 22:20:30 +02:00
renovate[bot]	19e6ed4b9b	Update dependency dev.notmyfault.serverlib:ServerLib to v2.3.7 (#4629 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-04-19 22:46:38 +00:00
renovate[bot]	6b1b0f2d6a	Update junit5 monorepo (#4628 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-04-11 16:43:06 +00:00
renovate[bot]	e499bc02ec	Update dependency com.diffplug.spotless to v7.0.3 (#4626 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-04-08 03:19:23 +00:00
Alexander Brandes	62084fffdd	Fix bad PlotPlayer#getUUID() javadocs Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-04-06 22:01:57 +02:00
Alexander Brandes	d012f79349	Back to snapshot for development Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-04-06 21:51:17 +02:00
Alexander Brandes	139d6efc70	Release 7.5.2 Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-04-06 21:49:08 +02:00
renovate[bot]	6f5cb917f2	Update adventure to v4.20.0 (#4625 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-04-05 21:25:07 +00:00
renovate[bot]	9bf66f1b7c	Update dependency org.checkerframework:checker-qual to v3.49.2 (#4623 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-04-01 21:38:21 +00:00
renovate[bot]	92875ebe7f	Update dependency net.essentialsx:EssentialsX to v2.21.0 (#4621 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-03-22 22:56:51 +00:00
renovate[bot]	25a4545f14	Update dependency com.github.spotbugs:spotbugs-annotations to v4.9.3 (#4618 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-03-15 06:33:24 +00:00
renovate[bot]	3fdeed019b	Update junit5 monorepo (#4617 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-03-14 14:40:52 +00:00
Tjorven Liebe	f3400df811	fix: plot entry trigger on teleport (#4593 )	2025-03-05 19:43:27 +00:00
renovate[bot]	beb7cb40f4	Update dependency org.checkerframework:checker-qual to v3.49.1 (#4614 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-03-03 22:26:52 +00:00
renovate[bot]	2c0bb03e5c	Update dependency com.github.spotbugs:spotbugs-annotations to v4.9.2 (#4613 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-03-01 21:56:49 +00:00
Hannes Greule	e8c170686c	Fix IndexOutOfBoundsException on BlockFertilizeEvent (#4609 )	2025-02-28 10:11:54 +01:00
szumielxd	ff8676cde3	Execute chunk loading operations outside the main thread (#4522 ) * Wait with further command execution until chunk will be loaded * Replaced `Throwable#printStackTraces` with `Logger#error` * Moved from jetbrains to javax annotations * Use preferred logging	2025-02-28 09:10:38 +00:00
renovate[bot]	817effb735	Update dependency gradle to v8.13 (#4610 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-25 13:14:17 +00:00
dordsor21	a0a3d8828a	Back to snapshot for development	2025-02-23 20:57:47 +00:00
dordsor21	8741bfcf88	Release 7.5.1	2025-02-23 20:46:30 +00:00
dordsor21	6a6c113e5b	fix: use orTimeout instead of completing null in chunk coordinator	2025-02-23 20:25:17 +00:00
renovate[bot]	3f573b4d46	Update fawe to v2.13.0 (#4607 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-23 14:35:55 +00:00
Alexander Brandes	2f6db9c3db	Back to snapshot for development Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-02-23 11:27:30 +01:00
Alexander Brandes	2f050b7b47	Release 7.5.0 Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-02-23 11:25:22 +01:00
Jordan	eb0d854870	fix: allow queues to not generate chunks (#4599 ) - initially apply to regenallroads - additionally add a 10s timeout for requesting a chunk before resubmitting it to the queue - addresses #4310	2025-02-23 11:21:18 +01:00
Pierre Maurice Schwang	d4f10422e3	1.21.4 (#4582 ) * chore: bump api to 1.21.4 * fix: replace (removed) constants with backwards compatible alternatives * chore: cleanup import * chore: update javadoc link for paper * chore: i like this more * fix: check for vehicle * chore: compile against 1.20.4 again * chore: add 1.21.4 to bug report issue template * chore: add 1.21.4 to runServer supported versions array * chore: update entity type enum name switch * chore: remove 1.18 from supportedVersions for runServer task * fix: attempt to update ReplicatingEntityWrapper * fix/chore: missing boat handling on spawn * chore: cleanup imports	2025-02-23 11:20:33 +01:00
TheJonstone✓	4e2ea67992	fix: update error message of `/p remove <player>` if player does not need to be removed (#4592 )	2025-02-22 19:25:49 +00:00
renovate[bot]	f533e194f4	Update junit5 monorepo (#4598 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-21 14:18:09 +00:00
renovate[bot]	98bc2e7407	Update adventure to v4.19.0 (#4597 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-17 03:18:04 +00:00
Phillipp Glanz	1b9d0d5317	Improve teleport behavior for home command (#4369 )	2025-02-15 15:29:21 +00:00
Alexander Brandes	8bb15d5c65	Back to snapshot for development Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-02-12 21:15:51 +01:00
Alexander Brandes	e9baa802ec	Release 7.4.2 Signed-off-by: Alexander Brandes <mc.cache@web.de>	2025-02-12 21:09:27 +01:00
renovate[bot]	63e2d325cf	Update dependency com.github.spotbugs:spotbugs-annotations to v4.9.1 (#4591 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-08 21:50:50 +00:00
renovate[bot]	94abd69e22	Update dependency org.checkerframework:checker-qual to v3.49.0 (#4587 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-03 22:23:37 +00:00
renovate[bot]	661e4ae8d3	Update dependency com.gradleup.shadow to v8.3.6 (#4585 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-02 21:38:30 +00:00
Pierre Maurice Schwang	974c639a51	fix: grow music inventory dynamically (#4583 )	2025-01-26 12:51:54 +01:00
renovate[bot]	11b806bd4d	Update dependency gradle to v8.12.1 (#4581 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-24 14:14:20 +00:00
renovate[bot]	0275372051	Update dependency com.github.spotbugs:spotbugs-annotations to v4.9.0 (#4572 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-16 13:14:02 +00:00
renovate[bot]	c18cf3acfe	Update dependency com.diffplug.spotless to v7.0.2 (#4571 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-14 21:41:40 +00:00
renovate[bot]	fa52149394	Update dependency com.diffplug.spotless to v7.0.1 (#4566 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-07 20:31:41 +00:00
renovate[bot]	f5108ec253	Update dependency com.diffplug.spotless to v7 (#4565 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-07 09:10:19 +00:00
renovate[bot]	a7058eeff2	Update eps1lon/actions-label-merge-conflict action to v3.0.3 (#4564 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-07 08:01:24 +00:00
renovate[bot]	eabae8db44	Update dependency org.checkerframework:checker-qual to v3.48.4 (#4563 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-07 08:01:08 +00:00
Alexander Brandes	a836e8e763	Back to snapshot for development Signed-off-by: Alexander Brandes <mc.cache@web.de>	2024-12-30 21:07:08 +01:00
Alexander Brandes	6930a9cecb	Release 7.4.1 Signed-off-by: Alexander Brandes <mc.cache@web.de>	2024-12-30 21:03:23 +01:00
Hannes Greule	effbacb823	Force-enable NETWORK side effect to ensure blocks are instantly visible (#4558 )	2024-12-30 21:01:10 +01:00
renovate[bot]	47d1f1e0cb	Update fawe to v2.12.3 (#4561 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-29 13:17:37 +00:00
renovate[bot]	6bedd9b25f	Update adventure to v4.18.0 (#4559 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-23 00:23:50 +00:00
Hannes Greule	960b7b2a8b	Add option to prevent entities from being moved from plot (#4554 )	2024-12-22 11:12:10 +01:00
renovate[bot]	198052b7a8	Update dependency gradle to v8.12 (#4555 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-20 20:51:53 +00:00
renovate[bot]	a5af3a9d16	Update junit5 monorepo (#4553 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-16 15:52:35 +00:00