fix: missing fallback if current plot is not explicitly overridden

* Update dependency com.gradleup.shadow to v9

* Fix missing shadow runtimes on Gradle 9

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

---------

Signed-off-by: Alexander Brandes <mc.cache@web.de>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Alexander Brandes <mc.cache@web.de>

.github/workflows/build-pr.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v5
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: gradle/actions/wrapper-validation@v5
       - name: Setup Java
         uses: actions/setup-java@v5
         with:

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v5
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: gradle/actions/wrapper-validation@v5
       - name: Setup Java
         uses: actions/setup-java@v5
         with:

.github/workflows/codeql.yml

@@ -27,10 +27,10 @@ jobs:
           distribution: temurin
           java-version: 21
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

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

@@ -160,7 +160,7 @@ public class EntityEventListener implements Listener {
                     return;
                 }
             }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SILVERFISH_BLOCK", "ENDER_PEARL",
                  "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
                  "FROZEN", "SPELL", "DEFAULT" -> {
                 if (!area.isMobSpawning()) {

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

@@ -202,7 +202,7 @@ public class PaperListener implements Listener {
                     return;
                 }
             }
-            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
                 if (!area.isMobSpawning()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);

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

@@ -90,7 +90,7 @@ public class DebugRoadRegen extends SubCommand {
     }
 
     public boolean regenPlot(PlotPlayer<?> player) {
-        PlotArea area = player.getCurrentPlot().getArea();
+        PlotArea area = player.getContextualPlotArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
             return false;
@@ -145,9 +145,10 @@ public class DebugRoadRegen extends SubCommand {
             return false;
         }
 
-        PlotArea area = player.getCurrentPlot().getArea();
+        PlotArea area = player.getContextualPlotArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
+            return false;
         }
         Plot plot = player.getCurrentPlot();
         PlotManager manager = area.getPlotManager();

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

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

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

@@ -68,11 +68,6 @@ public class Load extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer<?> player, final String[] args) {
-        final String world = player.getCurrentPlot().getWorldName();
-        if (!this.plotAreaManager.hasPlotArea(world)) {
-            player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
-            return false;
-        }
         final Plot plot = player.getCurrentPlot();
         if (plot == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot"));

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

@@ -78,7 +78,7 @@ public class Set extends SubCommand {
 
             @Override
             public boolean set(PlotPlayer<?> player, final Plot plot, String value) {
-                final PlotArea plotArea = player.getCurrentPlot().getArea();
+                final PlotArea plotArea = player.getContextualPlotArea();
                 if (plotArea == null) {
                     return false;
                 }

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

@@ -290,8 +290,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      *
      * @return the plot the player is standing on or null if standing on a road or not in a {@link PlotArea}
      */
-    @Nullable
-    public Plot getCurrentPlot() {
+    public @Nullable Plot getCurrentPlot() {
         try (final MetaDataAccess<Plot> lastPlotAccess =
                      this.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             if (lastPlotAccess.get().orElse(null) == null && !Settings.Enabled_Components.EVENTS) {
@@ -320,7 +319,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      */
     public int getPlotCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getPlotCount(getCurrentPlot().getWorldName());
+            return getPlotCount(getContextualWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         final UUID uuid = getUUID();
@@ -340,7 +339,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     public int getClusterCount() {
         if (!Settings.Limit.GLOBAL) {
-            return getClusterCount(getCurrentPlot().getWorldName());
+            return getClusterCount(getContextualWorldName());
         }
         final AtomicInteger count = new AtomicInteger(0);
         this.plotAreaManager.forEachPlotArea(value -> {
@@ -353,6 +352,34 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
         return count.get();
     }
 
+    /**
+     * {@return the world name at the player's contextual position}
+     * The contextual position can be affected when using a command with
+     * an explicit plot override, e.g., `/plot &ltid&gt info`.
+     */
+    private @NonNull String getContextualWorldName() {
+        Plot current = getCurrentPlot();
+        if (current != null) {
+            return current.getWorldName();
+        }
+        return getLocation().getWorldName();
+    }
+
+    /**
+     * {@return the plot area at the player's contextual position}
+     * The contextual position can be affected when using a command with
+     * an explicit plot override, e.g., `/plot &ltid&gt info`.
+     *
+     * @since TODO
+     */
+    public @Nullable PlotArea getContextualPlotArea() {
+        Plot current = getCurrentPlot();
+        if (current != null) {
+            return current.getArea();
+        }
+        return getLocation().getPlotArea();
+    }
+
     /**
      * Get the number of plots this player owns in the world.
      *
@@ -683,86 +710,87 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     public void populatePersistentMetaMap() {
         if (Settings.Enabled_Components.PERSISTENT_META) {
-            DBFunc.getPersistentMeta(getUUID(), new RunnableVal<>() {
-                @Override
-                public void run(Map<String, byte[]> value) {
-                    try {
-                        PlotPlayer.this.metaMap = value;
-                        if (value.isEmpty()) {
-                            return;
-                        }
-
-                        if (PlotPlayer.this.getAttribute("debug")) {
-                            debugModeEnabled.add(PlotPlayer.this);
-                        }
-
-                        if (!Settings.Teleport.ON_LOGIN) {
-                            return;
-                        }
-                        PlotAreaManager manager = PlotPlayer.this.plotAreaManager;
-
-                        if (!(manager instanceof SinglePlotAreaManager)) {
-                            return;
-                        }
-                        PlotArea area = ((SinglePlotAreaManager) manager).getArea();
-                        boolean V2 = false;
-                        byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
-                        if (arr == null) {
-                            arr = PlotPlayer.this.getPersistentMeta("quitLocV2");
-                            if (arr == null) {
-                                return;
-                            }
-                            V2 = true;
-                            removePersistentMeta("quitLocV2");
-                        } else {
-                            removePersistentMeta("quitLoc");
-                        }
-
-                        if (!getMeta("teleportOnLogin", true)) {
-                            return;
-                        }
-                        ByteBuffer quitWorld = ByteBuffer.wrap(arr);
-                        final int plotX = quitWorld.getShort();
-                        final int plotZ = quitWorld.getShort();
-                        PlotId id = PlotId.of(plotX, plotZ);
-                        int x = quitWorld.getInt();
-                        int y = V2 ? quitWorld.getShort() : (quitWorld.get() & 0xFF);
-                        int z = quitWorld.getInt();
-                        Plot plot = area.getOwnedPlot(id);
-
-                        if (plot == null) {
-                            return;
-                        }
-
-                        final Location location = Location.at(plot.getWorldName(), x, y, z);
-                        if (plot.isLoaded()) {
-                            TaskManager.runTask(() -> {
-                                if (getMeta("teleportOnLogin", true)) {
-                                    teleport(location, TeleportCause.LOGIN);
-                                    sendMessage(
-                                            TranslatableCaption.of("teleport.teleported_to_plot"));
+            DBFunc.getPersistentMeta(
+                    getUUID(), new RunnableVal<>() {
+                        @Override
+                        public void run(Map<String, byte[]> value) {
+                            try {
+                                PlotPlayer.this.metaMap = value;
+                                if (value.isEmpty()) {
+                                    return;
                                 }
-                            });
-                        } else if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-                            if (getMeta("teleportOnLogin", true)) {
-                                plot.teleportPlayer(
-                                        PlotPlayer.this,
-                                        result -> TaskManager.runTask(() -> {
-                                            if (getMeta("teleportOnLogin", true)) {
-                                                if (plot.isLoaded()) {
-                                                    teleport(location, TeleportCause.LOGIN);
-                                                    sendMessage(TranslatableCaption
-                                                            .of("teleport.teleported_to_plot"));
-                                                }
-                                            }
-                                        })
-                                );
+
+                                if (PlotPlayer.this.getAttribute("debug")) {
+                                    debugModeEnabled.add(PlotPlayer.this);
+                                }
+
+                                if (!Settings.Teleport.ON_LOGIN) {
+                                    return;
+                                }
+                                PlotAreaManager manager = PlotPlayer.this.plotAreaManager;
+
+                                if (!(manager instanceof SinglePlotAreaManager)) {
+                                    return;
+                                }
+                                PlotArea area = ((SinglePlotAreaManager) manager).getArea();
+                                boolean V2 = false;
+                                byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
+                                if (arr == null) {
+                                    arr = PlotPlayer.this.getPersistentMeta("quitLocV2");
+                                    if (arr == null) {
+                                        return;
+                                    }
+                                    V2 = true;
+                                    removePersistentMeta("quitLocV2");
+                                } else {
+                                    removePersistentMeta("quitLoc");
+                                }
+
+                                if (!getMeta("teleportOnLogin", true)) {
+                                    return;
+                                }
+                                ByteBuffer quitWorld = ByteBuffer.wrap(arr);
+                                final int plotX = quitWorld.getShort();
+                                final int plotZ = quitWorld.getShort();
+                                PlotId id = PlotId.of(plotX, plotZ);
+                                int x = quitWorld.getInt();
+                                int y = V2 ? quitWorld.getShort() : (quitWorld.get() & 0xFF);
+                                int z = quitWorld.getInt();
+                                Plot plot = area.getOwnedPlot(id);
+
+                                if (plot == null) {
+                                    return;
+                                }
+
+                                final Location location = Location.at(plot.getWorldName(), x, y, z);
+                                if (plot.isLoaded()) {
+                                    TaskManager.runTask(() -> {
+                                        if (getMeta("teleportOnLogin", true)) {
+                                            teleport(location, TeleportCause.LOGIN);
+                                            sendMessage(
+                                                    TranslatableCaption.of("teleport.teleported_to_plot"));
+                                        }
+                                    });
+                                } else if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+                                    if (getMeta("teleportOnLogin", true)) {
+                                        plot.teleportPlayer(
+                                                PlotPlayer.this,
+                                                result -> TaskManager.runTask(() -> {
+                                                    if (getMeta("teleportOnLogin", true)) {
+                                                        if (plot.isLoaded()) {
+                                                            teleport(location, TeleportCause.LOGIN);
+                                                            sendMessage(TranslatableCaption
+                                                                    .of("teleport.teleported_to_plot"));
+                                                        }
+                                                    }
+                                                })
+                                        );
+                                    }
+                                }
+                            } catch (Throwable e) {
+                                LOGGER.error("Error populating persistent meta for player {}", PlotPlayer.this.getName(), e);
                             }
                         }
-                    } catch (Throwable e) {
-                        LOGGER.error("Error populating persistent meta for player {}", PlotPlayer.this.getName(), e);
-                    }
-                }
                     }
             );
         }
@@ -832,7 +860,8 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
     }
 
     @SuppressWarnings("unchecked")
-    @Nullable <T> T getPersistentMeta(final @NonNull MetaDataKey<T> key) {
+    @Nullable
+    <T> T getPersistentMeta(final @NonNull MetaDataKey<T> key) {
         final byte[] value = this.getPersistentMeta(key.toString());
         if (value == null) {
             return null;
@@ -1002,9 +1031,11 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
             if (throwable != null) {
                 sendMessage(
                         TranslatableCaption.of("errors.error"),
-                        TagResolver.resolver("value", Tag.inserting(
-                                Component.text("Failed to resolve asynchronous caption replacements")
-                        ))
+                        TagResolver.resolver(
+                                "value", Tag.inserting(
+                                        Component.text("Failed to resolve asynchronous caption replacements")
+                                )
+                        )
                 );
                 LOGGER.error("Failed to resolve asynchronous tagresolver(s) for " + caption, throwable);
             } else {

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

@@ -541,7 +541,7 @@ public class Plot {
      *
      * @return World name
      */
-    public @Nullable String getWorldName() {
+    public @NonNull String getWorldName() {
         return area.getWorldName();
     }
 

Core/src/main/java/com/plotsquared/core/plot/world/SinglePlot.java

@@ -58,7 +58,7 @@ public class SinglePlot extends Plot {
     }
 
     @Override
-    public String getWorldName() {
+    public @NonNull String getWorldName() {
         return getId().toUnderscoreSeparatedString();
     }
 

build.gradle.kts

@@ -65,10 +65,16 @@ subprojects {
         plugin<IdeaPlugin>()
     }
 
+    configurations.matching { it.name == "signatures" }.configureEach {
+        attributes {
+            attribute(Attribute.of("signatures-unique", String::class.java), "true")
+        }
+    }
+
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.13.4")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
+        testImplementation("org.junit.jupiter:junit-jupiter:6.0.0")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.0")
     }
 
     plugins.withId("java") {
@@ -95,9 +101,15 @@ subprojects {
         }
     }
 
-    val javaComponent = components["java"] as AdhocComponentWithVariants
-    javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
-        skip()
+    afterEvaluate {
+        val javaComponent = components["java"] as AdhocComponentWithVariants
+        configurations.findByName("shadowRuntimeElements")?.let { shadowRuntimeElements ->
+            javaComponent.withVariantsFromConfiguration(shadowRuntimeElements) {
+                skip()
+            }
+        } ?: run {
+            logger.warn("Configuration 'shadowRuntimeElements' does not exist.")
+        }
     }
 
     signing {

gradle/libs.versions.toml

@@ -3,11 +3,11 @@
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.9.6"
-checkerqual = "3.51.0"
+checkerqual = "3.51.1"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.24.0"
+adventure = "4.25.0"
 adventure-bukkit = "4.4.1"
 log4j = "2.19.0"
 
@@ -33,11 +33,11 @@ vault = "1.7.1"
 serverlib = "2.3.7"
 
 # Gradle plugins
-shadow = "8.3.9"
+shadow = "9.2.2"
 grgit = "4.1.1"
 spotless = "8.0.0"
 publish = "0.34.0"
-runPaper = "3.0.0"
+runPaper = "3.0.2"
 
 [libraries]
 # Platform expectations

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell