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

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)))