From 0aaf5731861063a97767cf89e03fce5fd3b1b521 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Wed, 29 Oct 2014 22:26:50 +1100
Subject: [PATCH] we could just drop support for worldedit...

---
 .../com/intellectualcrafters/plot/PWE.java    | 34 ++++---------------
 .../plot/database/sqlobjects/PlotTable.java   |  8 +++--
 .../plot/generator/WorldGenerator.java        |  2 +-
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PWE.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PWE.java
index 8e84eedbc..f17358bfd 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PWE.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PWE.java
@@ -10,6 +10,8 @@ import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.mask.RegionMask;
 import com.sk89q.worldedit.regions.CuboidRegion;
 
 /**
@@ -55,8 +57,7 @@ public class PWE {
 						LocalWorld lw = PlotMain.worldEdit.wrapPlayer(p).getWorld();
 
 						CuboidRegion region = new CuboidRegion(lw, bvec, tvec);
-						com.sk89q.worldedit.masks.RegionMask mask = new com.sk89q.worldedit.masks.RegionMask(region);
-
+						RegionMask mask = new RegionMask(region);
 						s.setMask(mask);
 						return;
 					}
@@ -65,8 +66,7 @@ public class PWE {
 			if (noMask(s)) {
 				BukkitPlayer plr = PlotMain.worldEdit.wrapPlayer(p);
 				Vector p1 = new Vector(69, 69, 69), p2 = new Vector(69, 69, 69);
-
-				s.setMask(new com.sk89q.worldedit.masks.RegionMask(new CuboidRegion(plr.getWorld(), p1, p2)));
+				s.setMask(new RegionMask(new CuboidRegion(plr.getWorld(), p1, p2)));
 			}
 		}
 		catch (Exception e) {
@@ -76,33 +76,13 @@ public class PWE {
 		}
 	}
 
-    @SuppressWarnings("unused")
 	public static boolean noMask(LocalSession s) {
-//		try {
-//			com.sk89q.worldedit.masks.Mask mask = s.getMask();
-//			return mask == null;
-//		}
-
-
-
-//		catch (Throwable e) {
-//
-//
-// 	return true;
-//
-//
-// 		}
-        return true;
+		return s.getMask() == null;
 	}
 
 	public static void removeMask(Player p, LocalSession s) {
-//		try {
-//			s.setMask(null);
-//		}
-//		catch (Throwable e) {
-//			com.sk89q.worldedit.masks.Mask mask = null;
-//			s.setMask(mask);
-//		}
+	    Mask mask = null;
+	    s.setMask(mask);
 	}
 
 	public static void removeMask(Player p) {
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/sqlobjects/PlotTable.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/sqlobjects/PlotTable.java
index 01b4b0f5a..70f386b8b 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/sqlobjects/PlotTable.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/sqlobjects/PlotTable.java
@@ -6,8 +6,12 @@ package com.intellectualcrafters.plot.database.sqlobjects;
 public class PlotTable extends SQLTable {
 
     public PlotTable() {
-        super("plots");
+        super("plots", name, fields);
     }
 
-    public
+    @Override
+    public void create() {
+        // TODO Auto-generated method stub
+        
+    }
 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java
index ed51db378..331594518 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/WorldGenerator.java
@@ -71,7 +71,7 @@ public class WorldGenerator extends PlotGenerator {
 		return manager;
 	}
 	/**
-	 * Allow spawning everywhere (up to server owners to keep it safe)
+	 * Allow spawning everywhere
 	 */
 	@Override
     public boolean canSpawn(World world, int x, int z) {