From 9427bc7773ab57679ae4b4337970c25f64cd5c47 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Tue, 21 Oct 2014 16:36:40 +1100
Subject: [PATCH] Changed version number

---
 PlotSquared/src/com/intellectualcrafters/plot/C.java |  5 ++++-
 .../com/intellectualcrafters/plot/PlotHelper.java    | 12 ++++++++----
 PlotSquared/src/plugin.yml                           |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/PlotSquared/src/com/intellectualcrafters/plot/C.java b/PlotSquared/src/com/intellectualcrafters/plot/C.java
index 22f97a7b2..a66293cca 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/C.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/C.java
@@ -359,7 +359,10 @@ public enum C {
 	 */
 	public String s() {
         if(PlotMain.translations != null){
-            this.s = PlotMain.translations.getString(this.toString());
+            String t = PlotMain.translations.getString(this.toString());
+            if (t!=null) {
+                this.s = t;
+            }
         }
 		if (this.s.length() < 1) {
 			return this.d.replace("\\n", "\n");
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java b/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
index 0c1119e47..f68159e9f 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
@@ -115,7 +115,8 @@ public class PlotHelper {
 
 				PlotId id = new PlotId(x, y);
 				Plot plot = PlotMain.getPlots(world).get(id);
-
+				Plot plot2 = null;
+				
 				if (lx) {
 					if (ly) {
 						if (!plot.settings.getMerged(1) || !plot.settings.getMerged(2)) {
@@ -125,7 +126,7 @@ public class PlotHelper {
 					}
 					if (!plot.settings.getMerged(1)) {
 						changed = true;
-						Plot plot2 = PlotMain.getPlots(world).get(new PlotId(x + 1, y));
+						plot2 = PlotMain.getPlots(world).get(new PlotId(x + 1, y));
 						mergePlot(world, plot, plot2);
 						plot.settings.setMerged(1, true);
 						plot2.settings.setMerged(3, true);
@@ -134,7 +135,7 @@ public class PlotHelper {
 				if (ly) {
 					if (!plot.settings.getMerged(2)) {
 						changed = true;
-						Plot plot2 = PlotMain.getPlots(world).get(new PlotId(x, y + 1));
+						plot2 = PlotMain.getPlots(world).get(new PlotId(x, y + 1));
 						mergePlot(world, plot, plot2);
 						plot.settings.setMerged(2, true);
 						plot2.settings.setMerged(0, true);
@@ -142,7 +143,10 @@ public class PlotHelper {
 				}
 				if (changed) {
 				    result = true;
-					DBFunc.setMerged(world.getName(), plot, plot.settings.getMerged());
+				    DBFunc.setMerged(world.getName(), plot, plot.settings.getMerged());
+				    if (plot2!=null) {
+				        DBFunc.setMerged(world.getName(), plot2, plot2.settings.getMerged());
+				    }
 				}
 			}
 		}
diff --git a/PlotSquared/src/plugin.yml b/PlotSquared/src/plugin.yml
index 272adf151..89f617c73 100644
--- a/PlotSquared/src/plugin.yml
+++ b/PlotSquared/src/plugin.yml
@@ -1,6 +1,6 @@
 name: PlotSquared
 main: com.intellectualcrafters.plot.PlotMain
-version: 2.1
+version: 2.1.1
 load: STARTUP
 description: >
              Easy, yet powerful Plot World generation and management.