From aa09f024130c6f04549011d245500ce819560392 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Fri, 29 May 2015 03:41:25 +1000
Subject: [PATCH] Update converter

---
 PlotSquared/pom.xml                                          | 2 +-
 .../plot/database/plotme/ClassicPlotMeConnector.java         | 5 ++---
 .../intellectualcrafters/plot/listeners/PlayerEvents.java    | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml
index 5f9158e68..879deba89 100644
--- a/PlotSquared/pom.xml
+++ b/PlotSquared/pom.xml
@@ -8,7 +8,7 @@
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
     <artifactId>PlotSquared</artifactId>
-    <version>2.11.9</version>
+    <version>2.11.10</version>
     <name>PlotSquared</name>
     <packaging>jar</packaging>
     <build>
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java
index 4a128e36d..21b95e42b 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/ClassicPlotMeConnector.java
@@ -115,12 +115,11 @@ public class ClassicPlotMeConnector extends APlotMeConnector {
                     merges.put(world, new HashMap<PlotId,boolean[]>());
                 }
             }
-            
             if (merge) {
                 int tx = r.getInt("topX");
                 int tz = r.getInt("topZ");
-                int bx = r.getInt("bottomX");
-                int bz = r.getInt("bottomZ");
+                int bx = r.getInt("bottomX") - 1;
+                int bz = r.getInt("bottomZ") - 1;
                 int path = roadWidth.get(world);
                 int plot = plotWidth.get(world);
                 Location top = getPlotTopLocAbs(path, plot, id);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
index bd8fa2821..d1db47ed1 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
@@ -990,7 +990,6 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
             if (plot != null) {
                 final PlotPlayer pp = BukkitUtil.getPlayer(player);
                 if (plot.isDenied(pp.getUUID())) {
-                    System.out.print(2);
                     if (Permissions.hasPermission(pp, "plots.admin.enter.denied")) {
                         return;
                     }