From f331b1abaaec574c592dc7ea58b42a4f2864c159 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Thu, 25 Sep 2014 14:58:34 +1000
Subject: [PATCH] Fixed for worldguard 6 + fixes

- Improved plot perm checking (faster)
- Added toString() method for PlotId
- Fixed WorldGuard listener for WG 6
---
 .../intellectualcrafters/plot/PlayerFunctions.java    | 11 ++++-------
 .../src/com/intellectualcrafters/plot/PlotId.java     |  5 +++++
 .../plot/listeners/WorldGuardListener.java            |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java b/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
index a8f97f867..72beeb95f 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
@@ -195,15 +195,12 @@ public class PlayerFunctions {
         if (p.hasPermission("plots.admin")) {
             return Integer.MAX_VALUE;
         }
-        int y = 0;
-        for (int x = 1; x <= 100; x++) {
-            if (p.hasPermission("plots.plot." + x)) {
-                y = x;
-            } else {
-                break;
+        for (int x = 0; x <= 100; x++) {
+            if (p.hasPermission("plots.plot." + (100-x))) {
+                return 100-x;
             }
         }
-        return y;
+        return 0;
     }
 
     /**
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java b/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java
index ed632844e..ffc3dac0b 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java
@@ -23,6 +23,11 @@ public class PlotId {
         PlotId other = (PlotId) obj;
         return ((this.x == other.x) && (this.y == other.y));
     }
+    
+    @Override
+    public String toString() {
+        return this.x+";"+this.y;
+    }
 
     @Override
     public int hashCode() {
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldGuardListener.java b/PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldGuardListener.java
index 13cb45f61..3327680b6 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldGuardListener.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldGuardListener.java
@@ -41,7 +41,7 @@ public class WorldGuardListener implements Listener {
         BlockVector vector1 = new BlockVector(location1.getBlockX(), 1, location1.getBlockZ());
         BlockVector vector2 = new BlockVector(location2.getBlockX(), plot.getWorld().getMaxHeight(), location2.getBlockZ());
 
-        ProtectedRegion region = new ProtectedCuboidRegion(plot.getId().x + ";" + plot.getId().y, vector1, vector2);
+        ProtectedRegion region = new ProtectedCuboidRegion(plot.getId().x + "-" + plot.getId().y, vector1, vector2);
 
         DefaultDomain owner = new DefaultDomain();
         owner.addPlayer(PlotMain.worldGuard.wrapPlayer(player));
@@ -57,6 +57,6 @@ public class WorldGuardListener implements Listener {
         World world = Bukkit.getWorld(event.getWorld());
 
         RegionManager manager = PlotMain.worldGuard.getRegionManager(world);
-        manager.removeRegion(plot.x + ";" + plot.y);
+        manager.removeRegion(plot.x + "-" + plot.y);
     }
 }