From d8561d278f1fdf5b4cd5cb74de20222824df8bcb Mon Sep 17 00:00:00 2001 From: boy0001 Date: Tue, 21 Jul 2015 18:51:21 +1000 Subject: [PATCH] Fixed plot cluster creation --- .../intellectualcrafters/plot/commands/Cluster.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java b/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java index ed1aef502..80f9f8114 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java @@ -98,8 +98,8 @@ public class Cluster extends SubCommand { return false; } // check pos1 / pos2 - final PlotId pos1 = MainUtil.parseId(args[2]); - final PlotId pos2 = MainUtil.parseId(args[3]); + PlotId pos1 = MainUtil.parseId(args[2]); + PlotId pos2 = MainUtil.parseId(args[3]); if ((pos1 == null) || (pos2 == null)) { MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID); return false; @@ -115,10 +115,14 @@ public class Cluster extends SubCommand { //check if overlap final PlotClusterId id = new PlotClusterId(pos1, pos2); final HashSet intersects = ClusterManager.getIntersects(plr.getLocation().getWorld(), id); - if ((intersects.size() > 0) || (pos2.x < pos1.x) || (pos2.y < pos1.y)) { + if ((intersects.size() > 0)) { MainUtil.sendMessage(plr, C.CLUSTER_INTERSECTION, intersects.size() + ""); return false; } + if ((pos2.x < pos1.x) || (pos2.y < pos1.y) ) { + pos1 = new PlotId(Math.min(pos1.x, pos2.x), Math.min(pos1.y, pos2.y)); + pos2 = new PlotId(Math.max(pos1.x, pos2.x), Math.max(pos1.y, pos2.y)); + } // create cluster final String world = plr.getLocation().getWorld(); final PlotCluster cluster = new PlotCluster(world, pos1, pos2, UUIDHandler.getUUID(plr));