Compare commits

..

2 Commits

Author SHA1 Message Date
copilot-swe-agent[bot]
4e8f775772 Fix NullPointerException when listing plots from console
Co-authored-by: NotMyFault <13383509+NotMyFault@users.noreply.github.com>
2025-09-26 20:10:44 +00:00
copilot-swe-agent[bot]
31d27861e3 Initial plan 2025-09-26 20:04:12 +00:00
6 changed files with 18 additions and 9 deletions

View File

@@ -150,8 +150,9 @@ public class ListCmd extends SubCommand {
page = 0;
}
String world = player.getCurrentPlot().getWorldName();
PlotArea area = player.getCurrentPlot().getArea();
Plot currentPlot = player.getCurrentPlot();
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)))

View File

@@ -35,9 +35,9 @@ serverlib = "2.3.7"
# Gradle plugins
shadow = "8.3.9"
grgit = "4.1.1"
spotless = "8.0.0"
spotless = "7.2.1"
publish = "0.34.0"
runPaper = "3.0.0"
runPaper = "2.3.1"
[libraries]
# Platform expectations

Binary file not shown.

View File

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

5
gradlew vendored
View File

@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015 the original authors.
# Copyright © 2015-2021 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,6 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ 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" )
@@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"

3
gradlew.bat vendored
View File

@@ -70,10 +70,11 @@ 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%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
"%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" %*
:end
@rem End local scope for the variables with windows NT shell