Fix plot merge

Author: KCodeYT

pom.xml

@@ -25,12 +25,12 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.0</version>
+            <version>1.18.22</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

src/main/java/de/kcodeyt/plotplugin/command/defaults/MergeCommand.java

@@ -48,8 +48,7 @@ public boolean execute(Player player, String[] args) {
         if(player.hasPermission("plot.command.admin.merge") || (plot.isOwner(player.getUniqueId()) && rPlot.isOwner(player.getUniqueId()))) {
             final PlotPreMergeEvent plotPreMergeEvent = new PlotPreMergeEvent(player, plot, dir);
             this.plugin.getServer().getPluginManager().callEvent(plotPreMergeEvent);
-            if(plotPreMergeEvent.isCancelled())
-                return false;
+            if(plotPreMergeEvent.isCancelled()) return false;
 
             if(!plotManager.startMerge(plot, dir)) {
                 player.sendMessage(this.translate("merge-failure-no-plots-found"));

src/main/java/de/kcodeyt/plotplugin/manager/PlotManager.java

@@ -318,9 +318,16 @@ public Set<Plot> getConnectedPlots(Plot plot) {
     }
 
     public boolean startMerge(Plot plot, int dir) {
+        return this.startMerge(plot, dir, new HashSet<>());
+    }
+
+    public boolean startMerge(Plot plot, int dir, Set<PlotMerged> mergedSet) {
         if(!plot.hasOwner()) return false;
 
-        int max = 8;
+        final PlotMerged plotMerged = new PlotMerged(plot, dir);
+        if(mergedSet.contains(plotMerged)) return false;
+        mergedSet.add(plotMerged);
+
         final Set<Plot> visited = new HashSet<>();
         final Set<PlotVector> merged = new HashSet<>();
         final Set<Plot> connected = this.getConnectedPlots(plot);
@@ -340,17 +347,15 @@ public boolean startMerge(Plot plot, int dir) {
         });
 
         boolean toReturn = false;
-        while((current = frontier.poll()) != null && max >= 0) {
-            if(visited.contains(current)) continue;
+        while((current = frontier.poll()) != null) {
+            if(!visited.add(current)) continue;
 
-            visited.add(current);
-            Set<Plot> plots;
+            Set<Plot> nextPlots;
             for(int iDir = 0; iDir < 4; iDir++) {
                 if((dir == -1 || dir == iDir) && !current.isMerged(iDir)) {
                     final Plot other = this.getPlotById(current.getRelative(iDir));
-                    if(other.isOwner(plot.getOwner()) && (other.getBasePlot().equals(current.getBasePlot())
-                            || (plots = this.getConnectedPlots(other)).size() <= max && frontier.
-                            addAll(plots) && (max -= plots.size()) != -1)) {
+                    if(other.isOwner(plot.getOwner()) && (other.getBasePlot().equals(current.getBasePlot()) ||
+                            (nextPlots = this.getConnectedPlots(other)).size() > 0 && frontier.addAll(nextPlots))) {
                         this.mergePlot(other, current, whenDone);
                         merged.add(current.getPlotVector());
                         merged.add(other.getPlotVector());
@@ -360,6 +365,21 @@ public boolean startMerge(Plot plot, int dir) {
             }
         }
 
+        int relativeDir;
+        for(Plot visitedPlot0 : visited) {
+            for(Plot visitedPlot1 : visited) {
+                if(!visitedPlot0.equals(visitedPlot1)) continue;
+
+                relativeDir = visitedPlot0.getRelativeDir(visitedPlot1.getPlotVector());
+                if(!visitedPlot0.isMerged(relativeDir))
+                    this.startMerge(visitedPlot0, relativeDir, mergedSet);
+
+                relativeDir = visitedPlot1.getRelativeDir(visitedPlot0.getPlotVector());
+                if(!visitedPlot1.isMerged(relativeDir))
+                    this.startMerge(visitedPlot1, relativeDir, mergedSet);
+            }
+        }
+
         whenDone.start();
         return toReturn;
     }

src/main/java/de/kcodeyt/plotplugin/util/Plot.java

@@ -189,6 +189,17 @@ public PlotVector getRelative(int direction) {
         }
     }
 
+    public int getRelativeDir(PlotVector other) {
+        final int x = this.plotVector.getX() - other.getX();
+        final int z = this.plotVector.getZ() - other.getZ();
+
+        if(x == 0 && z == 1) return 0;
+        if(x == -1 && z == 0) return 1;
+        if(x == 0 && z == -1) return 2;
+        if(x == 1 && z == 0) return 3;
+        return -1;
+    }
+
     public void recalculateOrigin() {
         if(this.hasNoMerges()) {
             this.origin = this;

src/main/java/de/kcodeyt/plotplugin/util/PlotMerged.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 KCodeYT
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.kcodeyt.plotplugin.util;
+
+import lombok.Value;
+
+@Value
+public class PlotMerged {
+
+    Plot plot;
+    int dir;
+
+}