From 66d596b993b22140459af832c6fee3d7bd42eac0 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Tue, 21 Oct 2014 15:31:27 +1100
Subject: [PATCH] fixes

---
 .../intellectualcrafters/plot/PlotHelper.java | 43 +++++++++++++------
 .../com/intellectualcrafters/plot/PlotId.java |  2 +-
 .../plot/commands/Auto.java                   |  3 +-
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java b/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
index 676ab9fd7..192f0c20c 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
@@ -106,6 +106,8 @@ public class PlotHelper {
 		
 		manager.startPlotMerge(world, plotworld, plotIds);
 		
+		boolean result = false;
+		
 		for (int x = pos1.x; x <= pos2.x; x++) {
 			for (int y = pos1.y; y <= pos2.y; y++) {
 				
@@ -142,13 +144,14 @@ public class PlotHelper {
 					}
 				}
 				if (changed) {
+				    result = true;
 					DBFunc.setMerged(world.getName(), plot, plot.settings.getMerged());
 				}
 			}
 		}
 
 		manager.finishPlotMerge(world, plotworld, plotIds);
-		return true;
+		return result;
 	}
 
 	/**
@@ -315,34 +318,48 @@ public class PlotHelper {
 
 		ArrayList<PlotId> plots;
 		boolean merge = true;
+		int count = 0;
 		while (merge) {
+		    if (count>16) {
+		        break;
+		    }
+		    count++;
 			PlotId bot = PlayerFunctions.getBottomPlot(world, plot).id;
 			PlotId top = PlayerFunctions.getTopPlot(world, plot).id;
 			merge = false;
 			plots = PlayerFunctions.getPlotSelectionIds(world, new PlotId(bot.x, bot.y - 1), new PlotId(top.x, top.y));
 			if (ownsPlots(world, plots, player, 0)) {
-				merge = true;
-				mergePlots(world, plots);
-				continue;
+				boolean result = mergePlots(world, plots);
+				if (result) {
+				    merge = true;
+				    continue;
+				}
 			}
 			plots = PlayerFunctions.getPlotSelectionIds(world, new PlotId(bot.x, bot.y), new PlotId(top.x + 1, top.y));
 			if (ownsPlots(world, plots, player, 1)) {
-				merge = true;
-				mergePlots(world, plots);
-				continue;
+				boolean result = mergePlots(world, plots);
+				if (result) {
+                    merge = true;
+                    continue;
+                }
 			}
 			plots = PlayerFunctions.getPlotSelectionIds(world, new PlotId(bot.x, bot.y), new PlotId(top.x, top.y + 1));
 			if (ownsPlots(world, plots, player, 2)) {
-				merge = true;
-				mergePlots(world, plots);
-				continue;
+				boolean result = mergePlots(world, plots);
+				if (result) {
+                    merge = true;
+                    continue;
+                }
 			}
 			plots = PlayerFunctions.getPlotSelectionIds(world, new PlotId(bot.x - 1, bot.y), new PlotId(top.x, top.y));
 			if (ownsPlots(world, plots, player, 3)) {
-				merge = true;
-				mergePlots(world, plots);
-				continue;
+				boolean result = mergePlots(world, plots);
+				if (result) {
+                    merge = true;
+                    continue;
+                }
 			}
+			merge = false;
 		}
 		if (canSetFast) {
 			SetBlockFast.update(player);
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java b/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java
index 2d86fdcc2..1cacbe4cf 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java
@@ -35,7 +35,7 @@ public class PlotId {
 			return false;
 		}
 		PlotId other = (PlotId) obj;
-		return ((this.x == other.x) && (this.y == other.y));
+		return (((int) this.x == (int) other.x) && ((int) this.y == (int) other.y));
 	}
 
 	@Override
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java b/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java
index a22f926f8..935648038 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java
@@ -119,7 +119,7 @@ public class Auto extends SubCommand {
 				if ((z < q) && ((z - x) < q)) {
 					z++;
 				}
-				else
+				else {
 					if (x < q) {
 						x++;
 						z = q - 100;
@@ -129,6 +129,7 @@ public class Auto extends SubCommand {
 						x = q;
 						z = q;
 					}
+				}
 			}
 		}
 		else {