Release 7.5.11

Signed-off-by: Alexander Brandes <mc.cache@web.de>

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/stale.yml

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

.github/workflows/build-pr.yml

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

.github/workflows/build.yml

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

.github/workflows/codeql.yml

@@ -20,7 +20,7 @@ jobs:
         language: [ 'java' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup Java
         uses: actions/setup-java@v5
         with:

Bukkit/build.gradle.kts

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

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

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

Core/build.gradle.kts

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

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

@@ -40,7 +40,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
-import java.util.function.Supplier;
 
 @CommandDeclaration(command = "merge",
         aliases = "m",
@@ -117,11 +116,9 @@ public class Merge extends SubCommand {
         if (direction == null) {
             player.sendMessage(
                     TranslatableCaption.of("commandconfig.command_syntax"),
-                    TagResolver.resolver(
-                            "value", Tag.inserting(Component.text(
-                                    "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
-                            ))
-                    )
+                    TagResolver.resolver("value", Tag.inserting(Component.text(
+                            "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
+                    )))
             );
             player.sendMessage(
                     TranslatableCaption.of("help.direction"),
@@ -247,66 +244,54 @@ public class Merge extends SubCommand {
         }
         java.util.Set<UUID> uuids = adjacent.getOwners();
         boolean isOnline = false;
-        if (!force) {
-            for (final UUID owner : uuids) {
-                final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner);
-                if (accepter == null) {
-                    continue;
+        for (final UUID owner : uuids) {
+            final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner);
+            if (!force && accepter == null) {
+                continue;
+            }
+            isOnline = true;
+            final Direction dir = direction;
+            Runnable run = () -> {
+                accepter.sendMessage(TranslatableCaption.of("merge.merge_accepted"));
+                plot.getPlotModificationManager().autoMerge(dir, maxSize - size, owner, player, terrain);
+                PlotPlayer<?> plotPlayer = PlotSquared.platform().playerManager().getPlayerIfExists(player.getUUID());
+                if (plotPlayer == null) {
+                    accepter.sendMessage(TranslatableCaption.of("merge.merge_not_valid"));
+                    return;
                 }
-                isOnline = true;
-                final Direction dir = direction;
-                Supplier<Boolean> run = () -> {
-                    accepter.sendMessage(TranslatableCaption.of("merge.merge_accepted"));
-                    if (plot.getPlotModificationManager().autoMerge(dir, maxSize - size, owner, player, terrain)) {
-                        PlotPlayer<?> plotPlayer = PlotSquared.platform().playerManager().getPlayerIfExists(player.getUUID());
-                        if (plotPlayer == null) {
-                            accepter.sendMessage(TranslatableCaption.of("merge.merge_not_valid"));
-                            return false;
-                        }
-                        if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
-                            if (this.econHandler.getMoney(player) < price) {
-                                player.sendMessage(
-                                        TranslatableCaption.of("economy.cannot_afford_merge"),
-                                        TagResolver.resolver(
-                                                "money",
-                                                Tag.inserting(Component.text(this.econHandler.format(price)))
-                                        )
-                                );
-                                return false;
-                            }
-                            this.econHandler.withdrawMoney(player, price);
-                            player.sendMessage(
-                                    TranslatableCaption.of("economy.removed_balance"),
-                                    TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
-                            );
-                        }
-                        player.sendMessage(TranslatableCaption.of("merge.success_merge"));
-                        eventDispatcher.callPostMerge(player, plot);
-                        return true;
+                if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
+                    if (!force && this.econHandler.getMoney(player) < price) {
+                        player.sendMessage(
+                                TranslatableCaption.of("economy.cannot_afford_merge"),
+                                TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
+                        );
+                        return;
                     }
-                    player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
-                    return false;
-                };
-                if (hasConfirmation(player)) {
-                    CmdConfirm.addPending(
-                            accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
-                                    .deserialize(
-                                            TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
-                                            TagResolver.builder()
-                                                    .tag("player", Tag.inserting(Component.text(player.getName())))
-                                                    .tag(
-                                                            "location",
-                                                            Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
-                                                    )
-                                                    .build()
-                                    )),
-                            run::get
+                    this.econHandler.withdrawMoney(player, price);
+                    player.sendMessage(
+                            TranslatableCaption.of("economy.removed_balance"),
+                            TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
                     );
-                } else {
-                    return run.get();
                 }
-                // find first
-                break;
+                player.sendMessage(TranslatableCaption.of("merge.success_merge"));
+                eventDispatcher.callPostMerge(player, plot);
+            };
+            if (!force && hasConfirmation(player)) {
+                CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
+                                .deserialize(
+                                        TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
+                                        TagResolver.builder()
+                                                .tag("player", Tag.inserting(Component.text(player.getName())))
+                                                .tag(
+                                                        "location",
+                                                        Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
+                                                )
+                                                .build()
+                                )),
+                        run
+                );
+            } else {
+                run.run();
             }
         }
         if (force || !isOnline) {

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

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

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

@@ -1340,7 +1340,7 @@ public class Plot {
         for (Plot current : getConnectedPlots()) {
             List<PlotPlayer<?>> players = current.getPlayersInPlot();
             for (PlotPlayer<?> pp : players) {
-                this.plotListener.plotExit(pp, current);
+                this.plotListener.plotExit(pp, current, null, area);
             }
 
             if (Settings.Backup.DELETE_ON_UNCLAIM) {
@@ -2594,7 +2594,7 @@ public class Plot {
     public void reEnter() {
         TaskManager.runTaskLater(() -> {
             for (PlotPlayer<?> pp : Plot.this.getPlayersInPlot()) {
-                this.plotListener.plotExit(pp, Plot.this);
+                this.plotListener.plotExit(pp, Plot.this, Plot.this, area);
                 this.plotListener.plotEntry(pp, Plot.this);
             }
         }, TaskTime.ticks(1L));

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.11-SNAPSHOT"
+version = "7.5.11"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -231,9 +231,10 @@ tasks {
         register<RunServer>("runServer-$it") {
             dependsOn(getByName("cacheLatestFaweArtifact"))
             minecraftVersion(it)
-            pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false)
-                    .map { task -> (task as Jar).archiveFile }
-                    .toTypedArray())
+            pluginJars(project.files(
+                project(":plotsquared-bukkit").tasks.named<Jar>("shadowJar")
+                .map { it.archiveFile }
+            ))
             jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
             downloadPlugins {
                 url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/${project.ext["faweArtifact"]}")

gradle/libs.versions.toml

@@ -3,17 +3,17 @@
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.9.8"
-checkerqual = "3.52.0"
+checkerqual = "3.52.1"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.25.0"
+adventure = "4.26.1"
 adventure-bukkit = "4.4.1"
 log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.20"
-fawe = "2.14.0"
+fawe = "2.14.3"
 placeholderapi = "2.11.7"
 luckperms = "5.5"
 essentialsx = "2.21.2"
@@ -33,7 +33,7 @@ vault = "1.7.1"
 serverlib = "2.3.7"
 
 # Gradle plugins
-shadow = "9.2.2"
+shadow = "9.3.0"
 grgit = "4.1.1"
 spotless = "8.1.0"
 publish = "0.35.0"