diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java index c1fdcc155..da4489a49 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java @@ -71,6 +71,10 @@ public class Cluster extends SubCommand { return false; } PlotArea area = plr.getApplicablePlotArea(); + if (area == null) { + C.NOT_IN_PLOT_WORLD.send(plr); + return false; + } Set clusters = area.getClusters(); MainUtil.sendMessage(plr, C.CLUSTER_LIST_HEADING, clusters.size() + ""); for (PlotCluster cluster : clusters) { @@ -495,6 +499,7 @@ public class Cluster extends SubCommand { PlotArea area = plr.getApplicablePlotArea(); if (area == null) { C.NOT_IN_PLOT_WORLD.send(plr); + return false; } PlotCluster cluster = area.getCluster(args[1]); if (cluster == null) {