Fix NullPointerException when listing plots from console

Co-authored-by: NotMyFault <13383509+NotMyFault@users.noreply.github.com>

Bukkit/build.gradle.kts

@@ -17,6 +17,19 @@ repositories {
     }
 }
 
+// Make sure we control the exact version of paper being included, while dropping spigot + bukkit
+configurations.all {
+    exclude("org.bukkit")
+    exclude("org.spigotmc")
+
+    resolutionStrategy.eachDependency {
+        if (requested.group == "io.papermc.paper" && requested.name == "paper-api") {
+            useVersion(checkNotNull(libs.paper.orNull?.version))
+            because("specific paper version is required to prevent binary incompatibilities on older versions")
+        }
+    }
+}
+
 dependencies {
     api(projects.plotsquaredCore)
 
@@ -28,20 +41,13 @@ dependencies {
     implementation(libs.paperlib)
 
     // Plugins
-    compileOnly(libs.worldeditBukkit) {
+    compileOnly(libs.worldeditBukkit)
-        exclude(group = "org.bukkit")
-        exclude(group = "org.spigotmc")
-    }
     compileOnly(libs.faweBukkit) { isTransitive = false }
     testImplementation(libs.faweBukkit) { isTransitive = false }
-    compileOnly(libs.vault) {
+    compileOnly(libs.vault)
-        exclude(group = "org.bukkit")
-    }
     compileOnly(libs.placeholderapi)
     compileOnly(libs.luckperms)
-    compileOnly(libs.essentialsx) {
+    compileOnly(libs.essentialsx)
-        exclude(group = "org.spigotmc")
-    }
     compileOnly(libs.mvdwapi) { isTransitive = false }
 
     // Other libraries

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

@@ -150,8 +150,9 @@ public class ListCmd extends SubCommand {
             page = 0;
         }
 
-        String world = player.getCurrentPlot().getWorldName();
+        Plot currentPlot = player.getCurrentPlot();
-        PlotArea area = player.getCurrentPlot().getArea();
+        String world = currentPlot != null ? currentPlot.getWorldName() : null;
+        PlotArea area = currentPlot != null ? currentPlot.getArea() : null;
         String arg = args[0].toLowerCase();
         final boolean[] sort = new boolean[]{true};
 
@@ -226,13 +227,17 @@ public class ListCmd extends SubCommand {
                     );
                     return false;
                 }
-                if (!player.hasPermission("plots.list.world." + world)) {
+                if (world != null && !player.hasPermission("plots.list.world." + world)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
                             TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
                     );
                     return false;
                 }
+                if (world == null) {
+                    player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
+                    return false;
+                }
                 plotConsumer.accept(PlotQuery.newQuery().inWorld(world));
             }
             case "expired" -> {
@@ -257,7 +262,7 @@ public class ListCmd extends SubCommand {
                     );
                     return false;
                 }
-                if (!player.hasPermission("plots.list.world." + world)) {
+                if (world != null && !player.hasPermission("plots.list.world." + world)) {
                     player.sendMessage(
                             TranslatableCaption.of("permission.no_permission"),
                             TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.8-SNAPSHOT"
+version = "7.5.9-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.9.4"
+spotbugs = "4.9.6"
 checkerqual = "3.51.0"
 gson = "2.10"
 guava = "31.1-jre"