Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 13:05:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1367

Browse Source
This commit is contained in:
Jesse Boyd 2016-09-25 18:48:38 +10:00
parent 1b6d08b3fe
commit c99e23bd3c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
View File

@ -115,6 +115,10 @@ public class Cluster extends SubCommand {
return false; return false;
} }
// Check if it occupies existing plots // Check if it occupies existing plots
if (!area.contains(pos1) || !area.contains(pos2)) {
C.CLUSTER_OUTSIDE.send(player, area);
return false;
}
Set<Plot> plots = area.getPlotSelectionOwned(pos1, pos2); Set<Plot> plots = area.getPlotSelectionOwned(pos1, pos2);
if (!plots.isEmpty()) { if (!plots.isEmpty()) {
if (!Permissions.hasPermission(player, "plots.cluster.create.other")) { if (!Permissions.hasPermission(player, "plots.cluster.create.other")) {

1
Core/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -115,6 +115,7 @@ public enum C {
CLUSTER_LIST_HEADING("$2There are $1%s$2 clusters in this world", "Cluster"), CLUSTER_LIST_HEADING("$2There are $1%s$2 clusters in this world", "Cluster"),
CLUSTER_LIST_ELEMENT("$2 - $1%s&-", "Cluster"), CLUSTER_LIST_ELEMENT("$2 - $1%s&-", "Cluster"),
CLUSTER_INTERSECTION("$2The proposed area overlaps with: %s0", "Cluster"), CLUSTER_INTERSECTION("$2The proposed area overlaps with: %s0", "Cluster"),
CLUSTER_OUTSIDE("$2The proposed area is outside the plot area: %s0", "Cluster"),
CLUSTER_ADDED("$4Successfully created the cluster.", "Cluster"), CLUSTER_ADDED("$4Successfully created the cluster.", "Cluster"),
CLUSTER_DELETED("$4Successfully deleted the cluster.", "Cluster"), CLUSTER_DELETED("$4Successfully deleted the cluster.", "Cluster"),
CLUSTER_RESIZED("$4Successfully resized the cluster.", "Cluster"), CLUSTER_RESIZED("$4Successfully resized the cluster.", "Cluster"),